Merge branch 'master' of newgeom:newgeom.git

diff --cc src/ModuleBase/ModuleBase_Operation.cpp
Simple merge

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

diff --cc src/PartSet/PartSet_Module.cpp
index d052adf9e0e8b385b65b9fc912775ee9c40bf820,606c5789966eee02a806b0a68e020ab71126e0ed..23231b3dc15b398ff57351c1c6d2e83440360fec
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -173,10 -179,12 +179,12 @@@ void PartSet_Module::onLaunchOperation(
    PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
    if (aPreviewOp)
    {
-     std::list<XGUI_ViewerPrs> aPresentations = myWorkshop->displayer()->GetViewerPrs();
-     aPreviewOp->init(theFeature, aPresentations);
+     XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+     std::list<XGUI_ViewerPrs> aSelected = aDisplayer->GetSelected();
+     std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->GetHighlighted();
+     aPreviewOp->init(theFeature, aSelected, aHighlighted);
    }
 -  myWorkshop->actionsMgr()->setActionChecked(anOperation->getDescription()->operationId(), true);
 +  myWorkshop->actionsMgr()->updateCheckState();
    sendOperation(anOperation);
  }
  

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge