Merge branch 'master' into occ/bsplines

diff --cc src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
index e4f47673e86a92aa62e55f268e79979a090e03cd,855ce055a46a7eab21f9288174b5cabc3fc68bde..7e8ff1db5d49ba611905bf13954ccf76479a6507
--- 1/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
--- 2/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
+++ b/src/ConstructionPlugin/ConstructionPlugin_Plugin.cpp
@@@ -60,10 -60,10 +60,12 @@@ ConstructionPlugin_Plugin::Construction
      Config_Prop::IntSpin, SKETCH_WIDTH);
    Config_PropManager::registerProp(SKETCH_TAB_NAME, "angular_tolerance", "Angular tolerance",
      Config_Prop::DblSpin, "0.04");
 +  Config_PropManager::registerProp(SKETCH_TAB_NAME, "spline_weight", "Default spline weight",
 +    Config_Prop::DblSpin, "1.0");
    Config_PropManager::registerProp(SKETCH_TAB_NAME, "rotate_to_plane",
      "Rotate to plane when selected", Config_Prop::Boolean, "false");
+   Config_PropManager::registerProp(SKETCH_TAB_NAME, "operation_cursor",
+     "Cursor for Sketch operation", Config_Prop::Cursor, "0");
  
    // register this plugin
    ModelAPI_Session::get()->registerPlugin(this);

diff --cc src/ModuleBase/ModuleBase_ModelWidget.h
Simple merge

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

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

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

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

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

diff --cc src/SketchPlugin/SketchPlugin_msg_fr.ts
Simple merge

diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge