From: mpv <mpv@opencascade.com>
Date: Thu, 2 Jun 2016 14:42:55 +0000 (+0300)
Subject: Prepare version 2.3.1
X-Git-Tag: V_2.3.1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1691b88073850be9eaa478bd466065ddf54bf659;p=modules%2Fshaper.git

Prepare version 2.3.1
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30d8f301d..4a24cfde4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (SHAPER)
-SET (SHAPER_Version 2.3.0)
+SET (SHAPER_Version 2.3.1)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 
diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml
index 5ccf5998b..d24a8af36 100644
--- a/src/FeaturesPlugin/boolean_widget.xml
+++ b/src/FeaturesPlugin/boolean_widget.xml
@@ -6,9 +6,9 @@
     buttons_dir="horizontal"
     label="Operation type"
     tooltip="Type of boolean operation"
-    string_list="Cut Fuse Common Fill Smash"
+    string_list="Cut Fuse Common Smash"
     use_in_title="true"
-    icons_list="icons/Features/bool_cut.png icons/Features/bool_fuse.png icons/Features/bool_common.png icons/Features/bool_fill.png icons/Features/bool_smash.png"
+    icons_list="icons/Features/bool_cut.png icons/Features/bool_fuse.png icons/Features/bool_common.png icons/Features/bool_smash.png"
     default="0"
   />
   <multi_selector id="main_objects"
diff --git a/src/PythonAPI/examples/Platine.py b/src/PythonAPI/examples/Platine.py
index 9ff45cca5..bb22d2882 100644
--- a/src/PythonAPI/examples/Platine.py
+++ b/src/PythonAPI/examples/Platine.py
@@ -207,12 +207,12 @@ model.do()
 
 # START DEBUG PURPOSES
 # prepare a study without last operation to trap floating problem with degenerated line
-aPathToStore = os.path.join(os.getcwd(), "Data")
-print aPathToStore
-if not os.path.exists(aPathToStore):
-    os.mkdir(aPathToStore)
-results = ModelAPI.StringList()
-ModelAPI.ModelAPI_Session.get().save(aPathToStore, results)
+#aPathToStore = os.path.join(os.getcwd(), "Data")
+#print aPathToStore
+#if not os.path.exists(aPathToStore):
+#    os.mkdir(aPathToStore)
+#results = ModelAPI.StringList()
+#ModelAPI.ModelAPI_Session.get().save(aPathToStore, results)
 # END DEBUG PURPOSES
 b4 = body_4()