From: nds <nds@opencascade.com>
Date: Tue, 6 Sep 2016 12:19:51 +0000 (+0300)
Subject: Correction for reentrant tangent arc
X-Git-Tag: V_2.5.0~45
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5dd93936ffd114ed1b28deaa92954e2dfbb11866;p=modules%2Fshaper.git

Correction for reentrant tangent arc
---

diff --git a/src/PartSet/PartSet_SketcherReetntrantMgr.cpp b/src/PartSet/PartSet_SketcherReetntrantMgr.cpp
index 517e961c6..3f84648c8 100755
--- a/src/PartSet/PartSet_SketcherReetntrantMgr.cpp
+++ b/src/PartSet/PartSet_SketcherReetntrantMgr.cpp
@@ -227,7 +227,7 @@ bool PartSet_SketcherReetntrantMgr::processMouseReleased(ModuleBase_IViewWindow*
       PartSet_WidgetPoint2D* aPoint2DWdg = dynamic_cast<PartSet_WidgetPoint2D*>(module()->activeWidget());
       ModuleBase_ModelWidget* aFirstWidget = aPanel->findFirstAcceptingValueWidget();
       if (aPoint2DWdg && aPoint2DWdg == aFirstWidget) {
-        if (!aPreSelected.empty() && myPreviousFeature->getKind() == SketchPlugin_Point::ID())
+        if (!aPreSelected.empty())
           aPoint2DWdg->setPreSelection(aPreSelected.front());
         aPoint2DWdg->mouseReleased(theWnd, theEvent);
         if (!aPreSelected.empty())
@@ -560,7 +560,8 @@ bool PartSet_SketcherReetntrantMgr::copyReetntrantAttributes(const FeaturePtr& t
                                                              const bool isTemporary)
 {
   bool aChanged = false;
-  if (!theSourceFeature.get())
+  if (!theSourceFeature.get() || !theSourceFeature->data().get() ||
+      !theSourceFeature->data()->isValid())
     return aChanged;
 
   std::string aFeatureKind = theSourceFeature->getKind();