Assembly: Store DocumentObject instead of mbdPart for the dragged parts. Fixing the bug where doDragStep was 50% of time failing to find the correct DocumentObject due to bundling.

src/Mod/Assembly/App/AssemblyObject.cpp

@@ -194,12 +194,30 @@ void AssemblyObject::preDrag(std::vector<App::DocumentObject*> dragParts)
     solve();
     bundleFixed = false;
 
-    dragMbdParts.clear();
+    draggedParts.clear();
     for (auto part : dragParts) {
-        auto mbdPart = getMbDPart(part);
-        if (std::find(dragMbdParts.begin(), dragMbdParts.end(), mbdPart) == dragMbdParts.end()) {
-            dragMbdParts.push_back(mbdPart);
+        // make sure no duplicate
+        if (std::find(draggedParts.begin(), draggedParts.end(), part) != draggedParts.end()) {
+            continue;
         }
+
+        // Some objects have been bundled, we don't want to add these to dragged parts
+        Base::Placement plc;
+        for (auto& pair : objectPartMap) {
+            App::DocumentObject* parti = pair.first;
+            if (parti != part) {
+                continue;
+            }
+            plc = pair.second.offsetPlc;
+        }
+        if (!plc.isIdentity()) {
+            // If not identity, then it's a bundled object. Some bundled objects may
+            // have identity placement if they have the same position as the main object of
+            // the bundle. But they're not going to be a problem.
+            continue;
+        }
+
+        draggedParts.push_back(part);
     }
 
     mbdAssembly->runPreDrag();
@@ -208,21 +226,16 @@ void AssemblyObject::preDrag(std::vector<App::DocumentObject*> dragParts)
 void AssemblyObject::doDragStep()
 {
     try {
-        for (auto& mbdPart : dragMbdParts) {
-            App::DocumentObject* part = nullptr;
-
-            // Find the corresponding DocumentObject for the mbdPart
-            for (auto& pair : objectPartMap) {
-                if (pair.second.part == mbdPart) {
-                    part = pair.first;
-                    break;
-                }
-            }
+        std::vector<std::shared_ptr<MbD::ASMTPart>> dragMbdParts;
 
+        for (auto& part : draggedParts) {
             if (!part) {
                 continue;
             }
 
+            auto mbdPart = getMbDPart(part);
+            dragMbdParts.push_back(mbdPart);
+
             // Update the MBD part's position
             Base::Placement plc = getPlacementFromProp(part, "Placement");
             Base::Vector3d pos = plc.getPosition();

src/Mod/Assembly/App/AssemblyObject.h

@@ -250,7 +250,7 @@ private:
 
     std::unordered_map<App::DocumentObject*, MbDPartData> objectPartMap;
     std::vector<std::pair<App::DocumentObject*, double>> objMasses;
-    std::vector<std::shared_ptr<MbD::ASMTPart>> dragMbdParts;
+    std::vector<App::DocumentObject*> draggedParts;
 
     std::vector<std::pair<App::DocumentObject*, Base::Placement>> previousPositions;