Fix for activation of deleted and undo-deleted documents.

[modules/shaper.git] / src / Model / Model_Objects.cpp

diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp
index b083c265c6667552389eaca5b68f21f797a1d786..b34d47f142bb0285dd4f6fbd46122bcb29b3f598 100644 (file)
--- a/src/Model/Model_Objects.cpp
+++ b/src/Model/Model_Objects.cpp
@@ -562,6 +562,13 @@ void Model_Objects::setUniqueName(FeaturePtr theFeature)
         isSameName = (*aRIter)->data()->name() == aName;
       }
     }
+    // for new Parts create names that are not in the Postponed list
+    if (!isSameName && (theFeature->getKind() == "Part" || theFeature->getKind() == "Duplicate")) {
+      std::shared_ptr<Model_Session> aSession = 
+        std::dynamic_pointer_cast<Model_Session>(Model_Session::get());
+      isSameName = aSession->isLoadByDemand(aName) || aSession->hasDocument(aName);
+    }
+
     if (isSameName) {
       aNumObjects++;
       std::stringstream aNameStream;