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

Merge branch 'master' into BR_PYTHON_PLUGIN
---

f4f01be0d0f2642aaca4844b34c98a062e2afbb9
diff --cc src/Model/Model_Session.cpp
index 16a4d07f0,2c624b8aa..409e91cbf
--- a/src/Model/Model_Session.cpp
+++ b/src/Model/Model_Session.cpp
@@@ -92,10 -98,12 +98,13 @@@ void Model_Session::redo(
  
  FeaturePtr Model_Session::createFeature(string theFeatureID)
  {
 -  if (this != myImpl)
 +  if (this != myImpl) {
      return myImpl->createFeature(theFeatureID);
 +  }
  
+   // load all information about plugins, features and attributes
+   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()) {