From: vsv <vitaly.smetannikov@opencascade.com>
Date: Wed, 8 Apr 2015 09:38:00 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~54^2~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c910e9e2e9e68bc1a9f857d555a0201c2c4c75f1;p=modules%2Fshaper.git

Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
---

c910e9e2e9e68bc1a9f857d555a0201c2c4c75f1
diff --cc src/SketchPlugin/plugin-Sketch.xml
index b7ccc6f99,62dd358f1..323120ce9
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@@ -199,8 -196,8 +199,9 @@@
          <sketch_constraint_shape_selector id="ConstraintEntityB"
              label="Last object" tooltip="Select line or arc" shape_types="edge">
          <validator id="SketchPlugin_TangentAttr" parameters="ConstraintEntityA"/>
+         <validator id="PartSet_DifferentObjects"/>
          </sketch_constraint_shape_selector>
 +        <validator id="PartSet_TangentSelection"/>
        </feature>
        
      <!--  SketchConstraintMirror  -->