Merge pull request #87126 from ryevdokimov/fix-84424(2)

akien-mga · akien-mga · commit a1cc37966c4b · 2024-02-14T14:07:58.000+01:00
Fix position and basis of 3D Scenes instantiated via drag and drop
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -4371,7 +4371,8 @@ bool Node3DEditorViewport::_create_instance(Node *parent, String &path, const Po
 		}
 
 		Transform3D new_tf = node3d->get_transform();
-		new_tf.origin = parent_tf.affine_inverse().xform(preview_node_pos);
+		new_tf.origin = parent_tf.affine_inverse().xform(preview_node_pos + node3d->get_position());
+		new_tf.basis = parent_tf.affine_inverse().basis * new_tf.basis;
 
 		undo_redo->add_do_method(instantiated_scene, "set_transform", new_tf);
 	}

Original file line number	Diff line number	Diff line change
`@@ -4371,7 +4371,8 @@ bool Node3DEditorViewport::_create_instance(Node *parent, String &path, const Po`
`4371`	`4371`	`}`
`4372`	`4372`
`4373`	`4373`	`Transform3D new_tf = node3d->get_transform();`
`4374`		`- new_tf.origin = parent_tf.affine_inverse().xform(preview_node_pos);`
	`4374`	`+ new_tf.origin = parent_tf.affine_inverse().xform(preview_node_pos + node3d->get_position());`
	`4375`	`+ new_tf.basis = parent_tf.affine_inverse().basis * new_tf.basis;`
`4375`	`4376`
`4376`	`4377`	`undo_redo->add_do_method(instantiated_scene, "set_transform", new_tf);`
`4377`	`4378`	`}`