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

FreeCAD · Jan 1, 2015 · f3af41e · f3af41e
2 parents 051b38b + f545455
commit f3af41e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Mod/Part/App/FeatureChamfer.cpp b/src/Mod/Part/App/FeatureChamfer.cpp
@@ -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) {

diff --git a/src/Mod/Part/App/FeatureCompound.cpp b/src/Mod/Part/App/FeatureCompound.cpp
@@ -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) {

diff --git a/src/Mod/Part/App/FeatureFillet.cpp b/src/Mod/Part/App/FeatureFillet.cpp
@@ -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) {