From: mpv <mikhail.ponikarov@opencascade.com>
Date: Wed, 17 Sep 2014 12:12:11 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.4.4~43^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6c73143a14dc757cf35e672ad7c023e82ee658d1;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom
---

6c73143a14dc757cf35e672ad7c023e82ee658d1
diff --cc src/SketchPlugin/plugin-Sketch.xml
index 412944f03,f41abc2a2..04a99179e
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@@ -79,14 -77,11 +79,13 @@@
        
        <feature id="SketchConstraintPerpendicular" title="Perpendicular" tooltip="Create constraint defining two perpendicular lines" icon=":icons/perpendicular.png">
          <feature_selector id="ConstraintEntityA" label="First line" tooltip="Select an line in the viewer">
 -          <validator id="SketchPlugin_ResultLineValidator"/>
 +          <validator id="SketchPlugin_ResultLine"/>
 +          <validator id="SketchPlugin_DifferentObjects"/>
          </feature_selector>
          <feature_selector id="ConstraintEntityB" label="Last line" tooltip="Select an line in the viewer">
 -          <validator id="SketchPlugin_ResultLineValidator"/>
 +          <validator id="SketchPlugin_ResultLine"/>
 +          <validator id="SketchPlugin_DifferentObjects"/>
          </feature_selector>
-         <point_selector id="ConstraintFlyoutValuePnt" internal="1"/>
          <validator id="PartSet_PerpendicularValidator"/>
        </feature>
      </group>