From: dbv <dbv@opencascade.com>
Date: Mon, 28 Dec 2015 09:16:26 +0000 (+0300)
Subject: Revert "Issue #1191 ExtrusionCut on compound works wrong: Temporary modification... 
X-Git-Tag: V_2.1.0~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4e64d5da9c807edfd3a37197181fe0202748f9ab;p=modules%2Fshaper.git

Revert "Issue #1191 ExtrusionCut on compound works wrong: Temporary modification to provide possibility to perform the issue scenario. It should be validated and corrected. This is undo of 56393d00e7087f057b64198bfed1d95c0ad64850 integration."

This reverts commit 84edbb434d7d0e7b9502192301b16192e8ed606b.
---

diff --git a/src/Model/Model_BodyBuilder.cpp b/src/Model/Model_BodyBuilder.cpp
index 9d560ba23..eeb1edf6f 100755
--- a/src/Model/Model_BodyBuilder.cpp
+++ b/src/Model/Model_BodyBuilder.cpp
@@ -124,7 +124,7 @@ void Model_BodyBuilder::store(const std::shared_ptr<GeomAPI_Shape>& theShape,
     if (aShape.IsNull())
       return;  // null shape inside
 
-    /*if(!theIsStoreSameShapes) {
+    if(!theIsStoreSameShapes) {
       Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aShape, aShapeLab);
       if(!aNS.IsNull() && !aNS->IsEmpty()) {
         // This shape is already in document, store reference instead of shape;
@@ -132,7 +132,7 @@ void Model_BodyBuilder::store(const std::shared_ptr<GeomAPI_Shape>& theShape,
         TDF_Reference::Set(aShapeLab, aFoundLabel);
         return;
       }
-    }*/
+    }
 
     aBuilder.Generated(aShape);	
     // register name
@@ -214,12 +214,12 @@ void Model_BodyBuilder::storeModified(const std::shared_ptr<GeomAPI_Shape>& theO
 
       TopoDS_Iterator aSubIter(aShapeNew);
       for(int aTag = theDecomposeSolidsTag; aSubIter.More(); aSubIter.Next()) {
-        /*const TopoDS_Shape& aShape = aSubIter.Value();
+        const TopoDS_Shape& aShape = aSubIter.Value();
         Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aShape, aShapeLab);
         if(!aNS.IsNull() && !aNS->IsEmpty()) {
           // This shape is already in document, don't add it.
           continue;
-        }*/
+        }
         TNaming_Builder aSubBuilder(aShapeLab.FindChild(aTag++));
         aSubBuilder.Generated(aSubIter.Value());
         if(!aName.IsEmpty()) {
@@ -781,10 +781,10 @@ std::shared_ptr<GeomAPI_Shape> Model_BodyBuilder::shape()
   std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
   if (aData) {
     TDF_Label aShapeLab = aData->shapeLab();
-    /*Handle(TDF_Reference) aRef;
+    Handle(TDF_Reference) aRef;
     if (aShapeLab.FindAttribute(TDF_Reference::GetID(), aRef)) {
       aShapeLab = aRef->Get();
-    }*/
+    }
     Handle(TNaming_NamedShape) aName;
     if (aShapeLab.FindAttribute(TNaming_NamedShape::GetID(), aName)) {
       TopoDS_Shape aShape = aName->Get();