suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
Yorik van Havre 2015-01-01 19:06:26 -02:00
commit f3af41e4cc
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Part/App/FeatureChamfer.cpp
View File

@ -77,9 +77,13 @@ App::DocumentObjectExecReturn *Chamfer::execute(void)
return new App::DocumentObjectExecReturn("Resulting shape is null");
ShapeHistory history = buildHistory(mkChamfer, TopAbs_FACE, shape, base->Shape.getValue());
this->Shape.setValue(shape);
// make sure the 'PropertyShapeHistory' is not safed in undo/redo (#0001889)
PropertyShapeHistory prop;
prop.setContainer(this);
prop.setValue(history);
prop.setContainer(this);
prop.touch();
return App::DocumentObject::StdReturn;
}
catch (Standard_Failure) {

6
src/Mod/Part/App/FeatureCompound.cpp
View File

@ -86,9 +86,13 @@ App::DocumentObjectExecReturn *Compound::execute(void)
}
this->Shape.setValue(comp);
// make sure the 'PropertyShapeHistory' is not safed in undo/redo (#0001889)
PropertyShapeHistory prop;
prop.setContainer(this);
prop.setValues(history);
prop.setContainer(this);
prop.touch();
return App::DocumentObject::StdReturn;
}
catch (Standard_Failure) {

6
src/Mod/Part/App/FeatureFillet.cpp
View File

@ -76,9 +76,13 @@ App::DocumentObjectExecReturn *Fillet::execute(void)
return new App::DocumentObjectExecReturn("Resulting shape is null");
ShapeHistory history = buildHistory(mkFillet, TopAbs_FACE, shape, base->Shape.getValue());
this->Shape.setValue(shape);
// make sure the 'PropertyShapeHistory' is not safed in undo/redo (#0001889)
PropertyShapeHistory prop;
prop.setContainer(this);
prop.setValue(history);
prop.setContainer(this);
prop.touch();
return App::DocumentObject::StdReturn;
}
catch (Standard_Failure) {