From 5b19f729c2f6ad0901b355aa99aace51d4ac9efd Mon Sep 17 00:00:00 2001
From: Zi Ye <major.mcdoom@gmail.com>
Date: Tue, 17 Dec 2024 00:38:47 -0600
Subject: [PATCH] Fix errors when undoing collision generation for multiple
 meshes with different parents

---
 editor/plugins/mesh_instance_3d_editor_plugin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index 515e6b44529..63a98db70f0 100644
--- a/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -188,12 +188,12 @@ void MeshInstance3DEditor::_create_collision_shape() {
 				CollisionShape3D *cshape = memnew(CollisionShape3D);
 				cshape->set_shape(shape);
 				cshape->set_name("CollisionShape3D");
-				cshape->set_transform(node->get_transform());
+				cshape->set_transform(instance->get_transform());
 				ur->add_do_method(E, "add_sibling", cshape, true);
 				ur->add_do_method(cshape, "set_owner", owner);
 				ur->add_do_method(Node3DEditor::get_singleton(), SceneStringName(_request_gizmo), cshape);
 				ur->add_do_reference(cshape);
-				ur->add_undo_method(node->get_parent(), "remove_child", cshape);
+				ur->add_undo_method(instance->get_parent(), "remove_child", cshape);
 			}
 		}
 	}