Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / PartSet / PartSet_OperationFeatureEdit.cpp

diff --git a/src/PartSet/PartSet_OperationFeatureEdit.cpp b/src/PartSet/PartSet_OperationFeatureEdit.cpp
index 409adcd75adc9eeb40326fdd7874426b6173f241..3c74e6478c4b5e9129a5e459eb5875f2946492e1 100644 (file)
--- a/src/PartSet/PartSet_OperationFeatureEdit.cpp
+++ b/src/PartSet/PartSet_OperationFeatureEdit.cpp
@@ -88,8 +88,15 @@ void PartSet_OperationFeatureEdit::mousePressed(QMouseEvent* theEvent, Handle(V3
     bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier);
     if(aHasShift && !theHighlighted.empty()) {
       QList<ObjectPtr> aSelected;
-      aSelected.push_back(feature());
-      aSelected.push_back(theHighlighted.front().object());
+      std::list<ModuleBase_ViewerPrs>::const_iterator aIt;
+      for (aIt = theSelected.cbegin(); aIt != theSelected.cend(); ++aIt)
+        aSelected.append((*aIt).object());
+      /*for (aIt = theHighlighted.cbegin(); aIt != theHighlighted.cend(); ++aIt) {
+        if (!aSelected.contains((*aIt).object()))
+          aSelected.append((*aIt).object());
+      }*/
+      //aSelected.push_back(feature());
+      //aSelected.push_back(theHighlighted.front().object());
       emit setSelection(aSelected);
     }
     else if (aFeature) {