From: sbh <sergey.belash@opencascade.com>
Date: Thu, 22 May 2014 17:07:40 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.2~26
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c106aa5ba9e0cf644a13ccd709cbc9353cee7a25;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

c106aa5ba9e0cf644a13ccd709cbc9353cee7a25
diff --cc src/PartSet/PartSet_Module.cpp
index d052adf9e,606c57899..23231b3dc
--- a/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);
  }