From: azv <azv@opencascade.com>
Date: Mon, 31 Oct 2016 11:14:06 +0000 (+0300)
Subject: Fix incorrect linking of extrusion if the sketch has non-default name (issue #1839)
X-Git-Tag: V_2.6.0~137
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b9e87dcef9246d590eb8706be38ad1fe970b4c6b;p=modules%2Fshaper.git

Fix incorrect linking of extrusion if the sketch has non-default name (issue #1839)
---

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index b43241e36..bb5c46726 100644
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -303,16 +303,17 @@ bool ModelHighAPI_Dumper::processSubs(const std::shared_ptr<ModelAPI_CompositeFe
       myEntitiesStack.top().myEntity == EntityPtr(theComposite);
   bool isForceModelDo = isSubDumped && isDumpSetName &&
       (myEntitiesStack.top().myUserName || !myEntitiesStack.top().myResults.empty());
+
+  // dump "setName" for composite feature before "model.do()" command to apply the name too
+  if (isDumpSetName)
+    dumpEntitySetName();
+
   // It is necessary for the sketch to create its result when complete (command "model.do()").
   // This option is set by flat theDumpModelDo.
   // However, nested sketches are rebuilt by parent feature, so, they do not need
   // explicit call of "model.do()". This will be controlled by the depth of the stack.
   if (isForceModelDo || (theDumpModelDo && gCompositeStackDepth <= 1))
     *this << "model.do()" << std::endl;
-
-  // dump "setName" for composite feature
-  if (isDumpSetName)
-    dumpEntitySetName();
   return isOk;
 }