From: nds <natalia.donis@opencascade.com>
Date: Fri, 20 Feb 2015 10:24:08 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~176
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=85253719b1f5e630551c2590d23deab11db55fe1;p=modules%2Fshaper.git

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

85253719b1f5e630551c2590d23deab11db55fe1
diff --cc src/SketchPlugin/SketchPlugin_Feature.h
index 248f19c7b,549586efb..076b1d038
--- a/src/SketchPlugin/SketchPlugin_Feature.h
+++ b/src/SketchPlugin/SketchPlugin_Feature.h
@@@ -96,20 -76,8 +96,10 @@@ class SketchPlugin_Feature : public Mod
      // if this is a vertex
      //else if (thePrs->getShapeType() == 7)
      //  thePrs->setPointMarker(6, 2.);
 +    if (!aRGB.empty())
 +      thePrs->setColor(aRGB[0], aRGB[1], aRGB[2]);
    }
  
-   /// removes also all sub-sketch elements
-   SKETCHPLUGIN_EXPORT virtual void erase()
-   {
-     /*SketchPlugin_Sketch* aSketch = sketch();
-     if (aSketch)
-       aSketch->removeFeature(this);
-       */
-     ModelAPI_Feature::erase();
-   }
- 
    /// Returns the sketch of this feature
    SketchPlugin_Sketch* sketch();
  protected: