kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #16963 from FlachyJoe/fix_primitivePlacement

Browse Source 
PartDesign: Fix primitive placement
This commit is contained in:
Yorik van Havre
2024-10-07 17:39:27 +02:00
committed by GitHub
parent c214a18df6 84ab834044
commit 2a624e681c
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/PartDesign/App/FeaturePrimitive.cpp
View File

@@ -119,15 +119,20 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri
return new App::DocumentObjectExecReturn(
QT_TRANSLATE_NOOP("Exception", "Failed to perform boolean operation"));
}
boolOp = this->getSolid(boolOp);
TopoShape solidBoolOp = getSolid(boolOp);
// lets check if the result is a solid
if (boolOp.isNull()) {
if (solidBoolOp.isNull()) {
return new App::DocumentObjectExecReturn(
QT_TRANSLATE_NOOP("Exception", "Resulting shape is not a solid"));
}
boolOp = refineShapeIfActive(boolOp);
Shape.setValue(getSolid(boolOp));
AddSubShape.setValue(primitiveShape);
if (solidBoolOp == base){
//solidBoolOp is misplaced but boolOp is ok
Shape.setValue(boolOp);
return App::DocumentObject::StdReturn;
}
solidBoolOp = refineShapeIfActive(solidBoolOp);
Shape.setValue(getSolid(solidBoolOp));
}
catch (Standard_Failure& e) {
@@ -139,6 +144,10 @@ App::DocumentObjectExecReturn* FeaturePrimitive::execute(const TopoDS_Shape& pri
void FeaturePrimitive::onChanged(const App::Property* prop)
{
if (prop == &AttachmentOffset){
this->touch();
return;
}
FeatureAddSub::onChanged(prop);
}