]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' into BR_PYTHON_PLUGIN
authorSergey BELASH <belash.sergey@opencascade.com>
Mon, 17 Nov 2014 14:43:52 +0000 (17:43 +0300)
committerSergey BELASH <belash.sergey@opencascade.com>
Mon, 17 Nov 2014 14:43:52 +0000 (17:43 +0300)
1  2 
src/Model/Model_Session.cpp
src/ModelAPI/ModelAPI_Session.h

index 16a4d07f0bc2d242ffd2b63de10d32fdc5e8978a,2c624b8aabadf5fb7da45380d381b79283ba325a..409e91cbf29380bbc9289cde5b68b71e208c7e28
@@@ -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()) {
Simple merge