Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/SketchPlugin/SketchPlugin_Validators.cpp

diff --cc src/SketchPlugin/SketchPlugin_Validators.cpp
index 43ac4faddf82407798cb701a6ddf048fb4175563,555f0abfeb50e3e2c0b05225e91e83e658fa2b93..d62098dffc2ae3bb8db47d514bfa2bfb16a92d57
--- 1/src/SketchPlugin/SketchPlugin_Validators.cpp
--- 2/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