From: mpv <mpv@opencascade.com>
Date: Mon, 24 Jul 2017 12:00:37 +0000 (+0300)
Subject: Minor updates.
X-Git-Tag: V_2.7.2~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f96cf18f82e49fcad0d24c1f6ef5ceb7f2cc92ad;p=modules%2Fshaper.git

Minor updates.
---

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Pipe.cpp b/src/FeaturesPlugin/FeaturesPlugin_Pipe.cpp
index a386d8dc5..ca72a5aeb 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Pipe.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Pipe.cpp
@@ -342,9 +342,6 @@ void FeaturesPlugin_Pipe::storeResult(const std::shared_ptr<GeomAPI_Shape> theBa
                                            aGenTag++, aGenName + "Face", *aMapOfSubShapes.get());
   }
 
-  aResultBody->loadAndOrientGeneratedShapes(&thePipeAlgo, theBaseShape, aShapeTypeToExplode,
-                                            aGenTag++, aGenName, *aMapOfSubShapes.get());
-
   // Store from shapes.
   int aFromTag = aGenTag;
   storeShapes(aResultBody, aBaseShapeType, aMapOfSubShapes,
diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index c6d7dda35..03959c2ff 100755
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -1308,7 +1308,7 @@ TDF_Label Model_Document::findNamingName(std::string theName)
       // If not found child label with the exact sub-name, then try to find compound with
       // such sub-name without suffix.
       Standard_Integer aSuffixPos = aSubName.SearchFromEnd('_');
-      if (aSuffixPos != -1) {
+      if (aSuffixPos != -1 && aSuffixPos != aSubName.Length()) {
         TCollection_ExtendedString anIndexStr = aSubName.Split(aSuffixPos);
         aSubName.Remove(aSuffixPos);
         aNamesIter.Initialize(aFind->second, TDataStd_Name::GetID(), Standard_True);