From: sbh <sergey.belash@opencascade.com>
Date: Wed, 27 Aug 2014 06:58:49 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.4.4~97
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8dc74f82810d5f597b78633b457efb0ef4f89f9f;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/ModelAPI/ModelAPI_PluginManager.cpp
---

8dc74f82810d5f597b78633b457efb0ef4f89f9f
diff --cc src/ModelAPI/ModelAPI_PluginManager.cpp
index 2b83d0aed,16999630b..a0750645a
--- a/src/ModelAPI/ModelAPI_PluginManager.cpp
+++ b/src/ModelAPI/ModelAPI_PluginManager.cpp
@@@ -56,17 -57,17 +56,17 @@@ boost::shared_ptr<ModelAPI_PluginManage
    return MY_MANAGER;
  }
  
- const ModelAPI_EventCreator* MY_CREATOR = 0;  ///< instance of the events creator, one pre application
 -const ModelAPI_EventCreator* MY_API_CREATOR = 0; ///< instance of the events creator, one pre application
++const ModelAPI_EventCreator* MY_API_CREATOR = 0;  ///< instance of the events creator, one pre application
  
  const ModelAPI_EventCreator* ModelAPI_EventCreator::get()
  {
-   if (!MY_CREATOR) {  // import Model library that implements this interface of ModelAPI
 -  if (!MY_API_CREATOR) { // import Model library that implements this interface of ModelAPI
++  if (!MY_API_CREATOR) {  // import Model library that implements this interface of ModelAPI
      Config_ModuleReader::loadLibrary("Model");
    }
-   return MY_CREATOR;
+   return MY_API_CREATOR;
  }
 -  
 +
  void ModelAPI_EventCreator::set(const ModelAPI_EventCreator* theCreator)
  {
-   MY_CREATOR = theCreator;
+   MY_API_CREATOR = theCreator;
  }