From: nds <natalia.donis@opencascade.com>
Date: Thu, 16 Apr 2015 17:28:12 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~17^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=58185df5c4d0877054ea33a0fe8ebded75bd9d7b;p=modules%2Fshaper.git

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

Conflicts:
	src/PartSet/PartSet_SketcherMgr.cpp
---

58185df5c4d0877054ea33a0fe8ebded75bd9d7b
diff --cc src/PartSet/PartSet_SketcherMgr.cpp
index 3a9487469,c3c96f9f4..2634dd7a3
--- a/src/PartSet/PartSet_SketcherMgr.cpp
+++ b/src/PartSet/PartSet_SketcherMgr.cpp
@@@ -324,18 -326,17 +326,17 @@@ void PartSet_SketcherMgr::onMousePresse
        get2dPoint(theWnd, theEvent, myCurrentPoint);
        myDragDone = false;
        launchEditing();
-       // Init flyout point for radius rotation
-       FeaturePtr aFeature = myCurrentSelection.begin().key();
-       std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
-                 std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+       if (aFeature.get() != NULL) {
+         std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+                   std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
 -        if (aSPFeature->getKind() == SketchPlugin_ConstraintRadius::ID()) {
 +      if (aSPFeature.get() && aSPFeature->getKind() == SketchPlugin_ConstraintRadius::ID()) {
-         DataPtr aData = aSPFeature->data();
-         AttributePtr aAttr = aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
-         std::shared_ptr<GeomDataAPI_Point2D> aFPAttr = 
-           std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aAttr);
-         aFPAttr->setValue(myCurrentPoint.myCurX, myCurrentPoint.myCurY);
+           DataPtr aData = aSPFeature->data();
+           AttributePtr aAttr = aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT());
+           std::shared_ptr<GeomDataAPI_Point2D> aFPAttr = 
+             std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aAttr);
+           aFPAttr->setValue(myCurrentPoint.myCurX, myCurrentPoint.myCurY);
+         }
        }
- 
      } else if (isSketchOpe && isEditing) {
        // If selected another object commit current result
        aOperation->commit();