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

diff --cc src/SketchPlugin/SketchPlugin_Feature.h
index 248f19c7b8db3f747478b18fc9194377c2935024,549586efb5b139f0a2af3585d66a5f4715bad7d7..076b1d038f3f5456a92aef3b17fc5ef6a66bf932
--- 1/src/SketchPlugin/SketchPlugin_Feature.h
--- 2/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:

diff --cc src/SketchPlugin/SketchPlugin_Sketch.h
Simple merge