From 40672f21eb5ca70b63506b30eff31716516d532a Mon Sep 17 00:00:00 2001 From: nds Date: Sat, 26 Dec 2015 19:56:41 +0300 Subject: [PATCH] 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. --- src/Model/Model_BodyBuilder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Model/Model_BodyBuilder.cpp b/src/Model/Model_BodyBuilder.cpp index eeb1edf6f..9d560ba23 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& 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& theShape, TDF_Reference::Set(aShapeLab, aFoundLabel); return; } - } + }*/ aBuilder.Generated(aShape); // register name @@ -214,12 +214,12 @@ void Model_BodyBuilder::storeModified(const std::shared_ptr& 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 Model_BodyBuilder::shape() std::shared_ptr aData = std::dynamic_pointer_cast(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(); -- 2.39.2