From: azv <azv@opencascade.com>
Date: Tue, 29 Nov 2016 05:03:29 +0000 (+0300)
Subject: Sketcher: merge errors when merging two groups (issue #1893)
X-Git-Tag: V_2.6.0~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c2abb57ebb622471f232495cf6b6afda0702c59;p=modules%2Fshaper.git

Sketcher: merge errors when merging two groups (issue #1893)
---

diff --git a/src/SketchSolver/SketchSolver_Group.cpp b/src/SketchSolver/SketchSolver_Group.cpp
index 70f5afbb3..867775e50 100644
--- a/src/SketchSolver/SketchSolver_Group.cpp
+++ b/src/SketchSolver/SketchSolver_Group.cpp
@@ -477,6 +477,11 @@ void SketchSolver_Group::mergeGroups(const SketchSolver_Group& theGroup)
       continue;
     changeConstraint(aConstr);
   }
+
+  // merge previous states of groups => use the worst state,
+  // so the group after rebuilt may discard error messages if exist
+  if (theGroup.myPrevResult > myPrevResult)
+    myPrevResult = theGroup.myPrevResult;
 }
 
 // ============================================================================