Nested transactions for sketch.

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 37f1a8673a860b8e35152136df6729f400b62037..3f0378447e1e8b6854cca8b71f473f430db7dfac 100644 (file)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -179,7 +179,7 @@ void Model_Document::startOperation()
     myNestedStart = myTransactionsAfterSave;
   }
   // new command for this
-  myDoc->NewCommand();
+  myDoc->OpenCommand();
   // new command for all subs
   set<string>::iterator aSubIter = mySubs.begin();
   for(; aSubIter != mySubs.end(); aSubIter++)

diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.cpp b/src/SketchSolver/SketchSolver_ConstraintManager.cpp
index 4a47879faab6da65aadfed7598a0fe0620468d31..a2db1ce05c03adc6130145ae1d4ff06a09491f14 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintManager.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintManager.cpp
@@ -82,7 +82,8 @@ void SketchSolver_ConstraintManager::processEvent(const Events_Message* theMessa
     {
       boost::shared_ptr<SketchPlugin_Feature> aSketch =
         boost::dynamic_pointer_cast<SketchPlugin_Feature>(aUpdateMsg->feature());
-      changeWorkplane(aSketch);
+      if (aSketch)
+        changeWorkplane(aSketch);
       return ;
     }
     boost::shared_ptr<SketchPlugin_Constraint> aConstraint =