From 8acbb224fc7d7fef32eabbebb28459477e920be6 Mon Sep 17 00:00:00 2001
From: Tayler Miller <37850372+OnesAndZer0s@users.noreply.github.com>
Date: Thu, 17 Jul 2025 08:03:28 -0500
Subject: [PATCH] Assembly: Fixes bug for origins in Sub-`AssemblyLink`
 (#22415)

---
 src/Mod/Assembly/App/AssemblyLink.cpp | 9 ++++++---
 src/Mod/Assembly/App/AssemblyLink.h   | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Assembly/App/AssemblyLink.cpp b/src/Mod/Assembly/App/AssemblyLink.cpp
index 3a8d6530cd..6fa032466d 100644
--- a/src/Mod/Assembly/App/AssemblyLink.cpp
+++ b/src/Mod/Assembly/App/AssemblyLink.cpp
@@ -207,6 +207,7 @@ void AssemblyLink::synchronizeComponents()
 
             auto* subAsmLink = freecad_cast<AssemblyLink*>(obj2);
             auto* link2 = dynamic_cast<App::Link*>(obj2);
+
             if (subAsmLink) {
                 linkedObj = subAsmLink->getLinkedObject2(false);  // not recursive
             }
@@ -214,7 +215,7 @@ void AssemblyLink::synchronizeComponents()
                 linkedObj = link2->getLinkedObject(false);  // not recursive
             }
             else {
-                // We consider only Links and AssemblyLinks in the AssemblyLink.
+                // We consider only Links and AssemblyLinks
                 continue;
             }
 
@@ -228,8 +229,10 @@ void AssemblyLink::synchronizeComponents()
             // Add a link or a AssemblyLink to it in the AssemblyLink.
             if (obj->isDerivedFrom<AssemblyLink>()) {
                 auto* asmLink = static_cast<AssemblyLink*>(obj);
-                auto* subAsmLink = new AssemblyLink();
-                doc->addObject(subAsmLink, obj->getNameInDocument());
+
+                App::DocumentObject* newObj =
+                    doc->addObject("Assembly::AssemblyLink", obj->getNameInDocument());
+                auto* subAsmLink = static_cast<AssemblyLink*>(newObj);
                 subAsmLink->LinkedObject.setValue(obj);
                 subAsmLink->Rigid.setValue(asmLink->Rigid.getValue());
                 subAsmLink->Label.setValue(obj->Label.getValue());
diff --git a/src/Mod/Assembly/App/AssemblyLink.h b/src/Mod/Assembly/App/AssemblyLink.h
index 5bbcfefa40..370a78acb4 100644
--- a/src/Mod/Assembly/App/AssemblyLink.h
+++ b/src/Mod/Assembly/App/AssemblyLink.h
@@ -68,6 +68,9 @@ public:
 
     bool isRigid();
 
+    /**
+     * Update all of the components and joints from the Assembly
+     */
     void updateContents();
 
     void synchronizeComponents();