Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_OperationEditLine.cpp

diff --cc src/PartSet/PartSet_OperationEditLine.cpp
index 561ae86e3a5718fa351629d7897f0c2a9c966ba1,4cfbc3e9a4bb1326f056894e0697338626140828..d630bb2c3c914dcd9847677b2cc1a13d82fac739
--- 1/src/PartSet/PartSet_OperationEditLine.cpp
--- 2/src/PartSet/PartSet_OperationEditLine.cpp
+++ b/src/PartSet/PartSet_OperationEditLine.cpp
@@@ -177,20 -151,7 +179,20 @@@ void PartSet_OperationEditLine::stopOpe
    myFeatures.clear();
  }
  
- boost::shared_ptr<ModelAPI_Feature> PartSet_OperationEditLine::createFeature()
 +void PartSet_OperationEditLine::blockSelection(bool isBlocked, const bool isRestoreSelection)
 +{
 +  if (isBlocked) {
 +    emit setSelection(std::list<XGUI_ViewerPrs>());
 +    emit stopSelection(myFeatures, true);
 +  }
 +  else {
 +    emit stopSelection(myFeatures, false);
 +    if (isRestoreSelection)
 +      emit setSelection(myFeatures);
 +  }
 +}
 +
+ boost::shared_ptr<ModelAPI_Feature> PartSet_OperationEditLine::createFeature(const bool /*theFlushMessage*/)
  {
    // do nothing in order to do not create a new feature
    return boost::shared_ptr<ModelAPI_Feature>();

diff --cc src/PartSet/PartSet_OperationEditLine.h
index 8f0b62361174db341d136997d8c33436728cb377,d053067b85517278fe809893065b545dafa7e8d3..219d23b2c9eb4aec94114620833bd5edb4e9f2aa
--- 1/src/PartSet/PartSet_OperationEditLine.h
--- 2/src/PartSet/PartSet_OperationEditLine.h
+++ b/src/PartSet/PartSet_OperationEditLine.h
@@@ -114,17 -106,11 +114,18 @@@ protected
  
    /// Creates an operation new feature
    /// Returns NULL feature. This is an operation of edition, not creation.
+   /// \param theFlushMessage the flag whether the create message should be flushed
    /// \returns the created feature
-   virtual boost::shared_ptr<ModelAPI_Feature> createFeature();
+   virtual boost::shared_ptr<ModelAPI_Feature> createFeature(const bool theFlushMessage = true);
  
  protected:
 +  /// Emits a signal about the selection blocking. Emits a signal to change the selection.
 +  /// If the block is true, the signal clear selection, otherwise if restore selection flag allows,
 +  /// the internal operation features are to be selected
 +  /// \param isBlocked the state whether the operation is blocked or unblocked
 +  /// \param isRestoreSelection the state whether the selected objects should be reselected
 +  void blockSelection(bool isBlocked, const bool isRestoreSelection = true);
 +
    /// \brief Save the point to the line.
    /// \param theFeature the source feature
    /// \param theDeltaX the delta for X coordinate is moved

diff --cc src/PartSet/PartSet_OperationSketch.cpp
Simple merge

diff --cc src/PartSet/PartSet_OperationSketchBase.cpp
Simple merge

diff --cc src/PartSet/PartSet_OperationSketchBase.h
Simple merge

diff --cc src/PartSet/PartSet_OperationSketchLine.cpp
Simple merge

diff --cc src/PartSet/PartSet_OperationSketchLine.h
Simple merge