From: azv <azv@opencascade.com>
Date: Mon, 30 May 2016 09:36:00 +0000 (+0300)
Subject: Remove error status when the group with conflicting constraint is deleted (issue... 
X-Git-Tag: V_2.3.1~33
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c7b2185163980365ace395ea8d28e221b5e0a1cc;p=modules%2Fshaper.git

Remove error status when the group with conflicting constraint is deleted (issue #1520)
---

diff --git a/src/SketchSolver/SketchSolver_Group.cpp b/src/SketchSolver/SketchSolver_Group.cpp
index 639af961c..ed6b91239 100644
--- a/src/SketchSolver/SketchSolver_Group.cpp
+++ b/src/SketchSolver/SketchSolver_Group.cpp
@@ -328,7 +328,7 @@ bool SketchSolver_Group::resolveConstraints()
 {
   bool aResolved = false;
   bool isGroupEmpty = isEmpty() && myStorage->isEmpty();
-  if (myStorage->isNeedToResolve() && !isGroupEmpty) {
+  if (myStorage->isNeedToResolve() && (!isGroupEmpty || !myConflictingConstraints.empty())) {
     if (!mySketchSolver)
       mySketchSolver = SketchSolver_Manager::instance()->builder()->createSolver();