Preparation of version 2.2.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5658cf1f63891ba7bed74661a5c563c8b9d483cb..41bd7152619fb9935c211534517ee64acb4057d5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
 
 PROJECT (SHAPER)
-SET (SHAPER_Version 2.1.2)
+SET (SHAPER_Version 2.2.0)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index ae3ad77c28627e80434032a169227b3d99705154..323067442d7188b9f54eb16602ac182a712f7d71 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -25,7 +25,7 @@
       </feature>
       
       <!-- Intersection Point -->
-      <feature
+      <!-- feature
         id="SketchIntersectionPoint"
         title="Intersection Point"
         tooltip="Create intersection point"
@@ -41,7 +41,7 @@
           <validator id="SketchPlugin_IntersectionValidator"/>
         </sketch_shape_selector>
         <boolvalue id="Auxiliary" label="Auxiliary" default="false" tooltip="Construction element" obligatory="0"/>
-      </feature>
+      </feature -->
       
       <!-- SketchLine -->
       <feature id="SketchLine" title="Line" tooltip="Create line" icon=":icons/line.png">
@@ -326,6 +326,7 @@
       </feature>
       
     <!--  SketchConstraintCollinear  -->
+      <!--
       <feature id="SketchConstraintCollinear" title="Collinear" tooltip="Create constraint defining collinearity of two lines" icon=":icons/collinear.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="First line" tooltip="Select a line" shape_types="edge">
@@ -340,6 +341,7 @@
         </sketch_shape_selector>
         <validator id="PartSet_CollinearSelection"/>
       </feature>
+      -->
 
       <!--  SketchConstraintMiddle  -->
       <feature id="SketchConstraintMiddle" title="Middle point" tooltip="Create constraint for setting middle point on a line" icon=":icons/middlepoint.png">