Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN

Conflicts:
	linux_env.sh
	src/FeaturesPlugin/CMakeLists.txt
	src/ModelAPI/ModelAPI.i

diff --cc linux_env.sh
index becdc6db68f19fd2b113d7cb19a84b4576338315,fcbe77b868e98322647ced4401e595e1065a1a57..7992a8794b3c47d58e37485238fd146fe3aa90c7
--- 1/linux_env.sh
--- 2/linux_env.sh
+++ b/linux_env.sh
@@@ -35,9 -35,9 +35,10 @@@ export PATH=${CASROOT}:${PATH
  ##
  
  #------ NewGEOM ------
- export NEW_GEOM_ROOT_DIR=${ROOT_DIR}/install
- export PATH=${NEW_GEOM_ROOT_DIR}/bin:${NEW_GEOM_ROOT_DIR}/plugins:${PATH}
- export PYTHONPATH=${NEW_GEOM_ROOT_DIR}/swig:${NEW_GEOM_ROOT_DIR}/plugins:${PYTHONPATH}
- export LD_LIBRARY_PATH=${NEW_GEOM_ROOT_DIR}/bin:${NEW_GEOM_ROOT_DIR}/swig:${NEW_GEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH}
- export NEW_GEOM_CONFIG_FILE=${NEW_GEOM_ROOT_DIR}/plugins
- export NewGeomResources=${NEW_GEOM_ROOT_DIR}/resources
+ export NEWGEOM_ROOT_DIR=${ROOT_DIR}/install
+ export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH}
 -export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${PYTHONPATH}
++export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${NEW_GEOM_ROOT_DIR}/plugins:${PYTHONPATH}
+ export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH}
+ export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins
+ export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources
++

diff --cc src/Model/Model_Session.cpp
Simple merge

diff --cc src/ModelAPI/ModelAPI.i
index 65f4b5ae539250b7bf024f5a34c75711a337f4d2,ba16e8f1c1a2ffbe453e7956f5d3b59105f8092a..e7ecbed9b54758c10395535b35147c378e4a73f3
--- 1/src/ModelAPI/ModelAPI.i
--- 2/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@@ -8,7 -8,7 +8,8 @@@
    #include "ModelAPI_Session.h"
    #include "ModelAPI_Object.h"
    #include "ModelAPI_Feature.h"
 +  #include "ModelAPI_Plugin.h"
+   #include "ModelAPI_CompositeFeature.h"
    #include "ModelAPI_Data.h"
    #include "ModelAPI_Attribute.h"
    #include "ModelAPI_AttributeDocRef.h"
@@@ -50,8 -52,8 +53,9 @@@
  %shared_ptr(ModelAPI_Document)
  %shared_ptr(ModelAPI_Session)
  %shared_ptr(ModelAPI_Object)
 +// %shared_ptr(ModelAPI_Plugin)
  %shared_ptr(ModelAPI_Feature)
+ %shared_ptr(ModelAPI_CompositeFeature)
  %shared_ptr(ModelAPI_Data)
  %shared_ptr(ModelAPI_Attribute)
  %shared_ptr(ModelAPI_AttributeDocRef)
@@@ -74,8 -77,8 +80,9 @@@
  %include "ModelAPI_Document.h"
  %include "ModelAPI_Session.h"
  %include "ModelAPI_Object.h"
 +%include "ModelAPI_Plugin.h"
  %include "ModelAPI_Feature.h"
+ %include "ModelAPI_CompositeFeature.h"
  %include "ModelAPI_Data.h"
  %include "ModelAPI_Attribute.h"
  %include "ModelAPI_AttributeDocRef.h"