Merge branch 'occ/shaper2smesh'

diff --cc salomeRun_deb.bat
index 17e988d5561f14898566f99b13c4ea519d4ab4fa,be74b98121d9ac7844ebc337dc4d3e180d0c854f..5534c345ce059291fb2514d36701ddbd1658f51e
--- 1/salomeRun_deb.bat
--- 2/salomeRun_deb.bat
+++ b/salomeRun_deb.bat
@@@ -8,11 -8,8 +8,11 @@@ pushd %PARENT_DIR
  popd
  
  @SET OCC_LIB_PREFIX=d
- call env_Salome.bat d
+ call env_Salome.bat d run
  
 +rem Variable which is necessary for launching SALOME
 +SET SALOME_PLEASE_SETUP_ENVIRONMENT_AS_BEFORE=1
 +
  @SET SHAPER_ROOT_DIR=%ROOT_DIR%\install
  @SET SalomeAppConfig=%SHAPER_ROOT_DIR%\share\salome\resources\shaper;%GUI_ROOT_DIR%\share\salome\resources\gui
  

diff --cc src/ExchangePlugin/ExchangePlugin_Dump.cpp
index 097042a286c29427aa9dd52a64d2d1b56ed4b8f9,9ca46901b0afd9361f285cd821cd80a1615d06aa..e955db6548ec522c169b2aac63f24b1785da8c86
--- 1/src/ExchangePlugin/ExchangePlugin_Dump.cpp
--- 2/src/ExchangePlugin/ExchangePlugin_Dump.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
@@@ -65,10 -47,13 +65,13 @@@ void ExchangePlugin_Dump::initAttribute
    data()->addAttribute(GEOMETRIC_DUMP_ID(), ModelAPI_AttributeBoolean::typeId());
    data()->addAttribute(WEAK_NAMING_DUMP_ID(), ModelAPI_AttributeBoolean::typeId());
  
+   data()->addAttribute(EXPORT_VARIABLES_ID(), ModelAPI_AttributeBoolean::typeId());
+ 
    // default values
 -  boolean(TOPOLOGICAL_NAMING_DUMP_ID())->setValue(true);
 -  boolean(GEOMETRIC_DUMP_ID())->setValue(true);
 -  boolean(WEAK_NAMING_DUMP_ID())->setValue(false);
 +  boolean(TOPOLOGICAL_NAMING_DUMP_ID())->setValue(THE_DUMP_NAMING);
 +  boolean(GEOMETRIC_DUMP_ID())->setValue(THE_DUMP_GEO);
 +  boolean(WEAK_NAMING_DUMP_ID())->setValue(THE_DUMP_WEAK);
+   boolean(EXPORT_VARIABLES_ID())->setValue(false);
  }
  
  void ExchangePlugin_Dump::execute()

diff --cc src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
index 81a78f0d8cc3ad574baa4497d7133584ac9af7ce,02a12e88f0044aa254db331d6be268fbabf071ad..93500cc5e7660a345a7aa6e851878269123e23fe
--- 1/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
--- 2/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
@@@ -592,9 -575,9 +592,9 @@@ bool ExchangePlugin_ExportFeature::isMa
      }
    }
  
-   if (aFormat == "XAO") { // on export to GEOm the selection attribute is filled - this is
+   if (aFormat == "XAO") { // on export to GEOM the selection attribute is filled - this is
                            // an exceptional case where export to XAO feature must be kept
 -    AttributeSelectionListPtr aList = aThis->selectionList(SELECTION_LIST_ID());
 +    AttributeSelectionListPtr aList = aThis->selectionList(XAO_SELECTION_LIST_ID());
      return !aList->isInitialized() || aList->size() == 0;
    }
    return true;

diff --cc src/GeomAPI/GeomAPI_Shape.cpp
Simple merge

diff --cc src/GeomAPI/GeomAPI_Shape.h
Simple merge

diff --cc src/ModelAPI/ModelAPI_Tools.cpp
Simple merge

diff --cc src/ModelHighAPI/ModelHighAPI_Dumper.cpp
Simple merge

diff --cc src/ModelHighAPI/ModelHighAPI_Dumper.h
Simple merge

diff --cc src/SHAPERGUI/SHAPERGUI.cpp
Simple merge