From: Sergey BELASH <belash.sergey@opencascade.com>
Date: Mon, 17 Nov 2014 14:43:13 +0000 (+0300)
Subject: Merge branch 'master' into BR_PYTHON_PLUGIN
X-Git-Tag: V_0.7.0_rc1~57^2~3^2~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=acebef0bc5fb22dc9672e0046085b896e957af56;p=modules%2Fshaper.git

Merge branch 'master' into BR_PYTHON_PLUGIN
---

acebef0bc5fb22dc9672e0046085b896e957af56
diff --cc src/Model/Model_Session.cpp
index 921017d11,23e7a2621..16a4d07f0
--- a/src/Model/Model_Session.cpp
+++ b/src/Model/Model_Session.cpp
@@@ -91,11 -92,9 +92,10 @@@ void Model_Session::redo(
  
  FeaturePtr Model_Session::createFeature(string theFeatureID)
  {
 -  if (this != myImpl)
 +  if (this != myImpl) {
      return myImpl->createFeature(theFeatureID);
 +  }
  
-   LoadPluginsInfo();
    if (myPlugins.find(theFeatureID) != myPlugins.end()) {
      std::pair<std::string, std::string>& aPlugin = myPlugins[theFeatureID]; // plugin and doc kind
      if (!aPlugin.second.empty() && aPlugin.second != activeDocument()->kind()) {