From 7c2abb57ebb622471f232495cf6b6afda0702c59 Mon Sep 17 00:00:00 2001 From: azv Date: Tue, 29 Nov 2016 08:03:29 +0300 Subject: [PATCH] Sketcher: merge errors when merging two groups (issue #1893) --- src/SketchSolver/SketchSolver_Group.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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; } // ============================================================================ -- 2.30.2