From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 23 Sep 2014 07:42:54 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.4.4~32^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bade2818f95b50039acae103139dc25229e4b36f;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/SketchPlugin/SketchPlugin_Validators.cpp
---

bade2818f95b50039acae103139dc25229e4b36f
diff --cc src/SketchPlugin/SketchPlugin_Validators.cpp
index 43ac4fadd,555f0abfe..d62098dff
--- a/src/SketchPlugin/SketchPlugin_Validators.cpp
+++ b/src/SketchPlugin/SketchPlugin_Validators.cpp
@@@ -21,8 -21,8 +21,8 @@@ bool SketchPlugin_DistanceAttrValidator
  
    // If the object is not a line then it is accepted
    const ModelAPI_ResultValidator* aLineValidator =
-       dynamic_cast<const ModelAPI_ResultValidator*>(aFactory->validator("SketchPlugin_ResultLineValidator"));
+       dynamic_cast<const ModelAPI_ResultValidator*>(aFactory->validator("SketchPlugin_ResultLine"));
 -  if (!aLineValidator->isValid(theObject))
 +  if (aLineValidator && (!aLineValidator->isValid(theObject)))
      return true;
  
    // If it is a line then we have to check that first attribute id not a line