A fix for the next case:

[modules/shaper.git] / src / PartSetPlugin / PartSetPlugin_Part.cpp

diff --git a/src/PartSetPlugin/PartSetPlugin_Part.cpp b/src/PartSetPlugin/PartSetPlugin_Part.cpp
index 58c2d85fd3384c6ca14a7a3506ce77c5a0306ecf..09a768acf8b9f2b19cc385c1d3bbf96ef8e70cc2 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Part.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Part.cpp
@@ -27,11 +27,16 @@ void PartSetPlugin_Part::execute()
   if (!aResult) {
     aResult = document()->createPart(data());
     setResult(aResult);
-    aResult->activate();
+    // do not activate part by simple execution if it is not loaded yet: it must be explicitly
+    // activated for this
+    if (!ModelAPI_Session::get()->isLoadByDemand(aResult->data()->name())) {
+      aResult->activate();
+    }
   }
 }
 
-std::shared_ptr<ModelAPI_Document> PartSetPlugin_Part::documentToAdd()
+const std::string& PartSetPlugin_Part::documentToAdd()
 {
-  return ModelAPI_Session::get()->moduleDocument();
+  // part must be added only to the module document
+  return ModelAPI_Session::get()->moduleDocument()->kind();
 }