Merge branch 'BR_DEBIAN_RUNTIME' of newgeom:newgeom.git into Dev_1.1.0

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintGroup.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.cpp b/src/SketchSolver/SketchSolver_ConstraintGroup.cpp
index 2dc2db4ac2256ef63e172471aa4f7a38a61bee3b..fcdcf3617d8416f6ed3fbd4dead2fe5e96a8710e 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintGroup.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintGroup.cpp
@@ -660,6 +660,22 @@ bool SketchSolver_ConstraintGroup::changeMirrorConstraint(
 
   std::list<ObjectPtr> aBaseList = aBaseRefList->list();
   std::list<ObjectPtr> aMirroredList = aMirroredRefList->list();
+  // remove all empty items
+  std::list<ObjectPtr>::iterator anIt = aBaseList.begin();
+  std::list<ObjectPtr>::iterator aTmpIt;
+  while (anIt != aBaseList.end()) {
+    aTmpIt = anIt;
+    anIt++;
+    if (!(*aTmpIt))
+      aBaseList.erase(aTmpIt);
+  }
+  anIt = aMirroredList.begin();
+  while (anIt != aMirroredList.end()) {
+    aTmpIt = anIt;
+    anIt++;
+    if (!(*aTmpIt))
+      aMirroredList.erase(aTmpIt);
+  }
   if (aBaseList.empty() || aBaseList.size() != aMirroredList.size())
     return false;