asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67666 from timothyqiu/editable-owner

Browse source 
[3.x] Fix wrong owner for editor plugin created nodes in instanced scene
This commit is contained in:
Rémi Verschelde 2022-11-15 18:00:38 +01:00 committed by GitHub
commit 36a8ebf882
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editor/plugins/mesh_instance_editor_plugin.cpp
View file

@ -76,7 +76,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
StaticBody *body = memnew(StaticBody); StaticBody *body = memnew(StaticBody);
body->add_child(cshape); body->add_child(cshape);
Node *owner = node == get_tree()->get_edited_scene_root() ? node : node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
ur->create_action(TTR("Create Static Trimesh Body")); ur->create_action(TTR("Create Static Trimesh Body"));
ur->add_do_method(node, "add_child", body); ur->add_do_method(node, "add_child", body);
@ -111,7 +111,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
StaticBody *body = memnew(StaticBody); StaticBody *body = memnew(StaticBody);
body->add_child(cshape); body->add_child(cshape);
Node *owner = instance == get_tree()->get_edited_scene_root() ? instance : instance->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
ur->add_do_method(instance, "add_child", body); ur->add_do_method(instance, "add_child", body);
ur->add_do_method(body, "set_owner", owner); ur->add_do_method(body, "set_owner", owner);
@ -140,7 +140,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
cshape->set_shape(shape); cshape->set_shape(shape);
cshape->set_transform(node->get_transform()); cshape->set_transform(node->get_transform());
Node *owner = node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
@ -183,7 +183,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
cshape->set_shape(shape); cshape->set_shape(shape);
cshape->set_transform(node->get_transform()); cshape->set_transform(node->get_transform());
Node *owner = node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
ur->add_do_method(node->get_parent(), "add_child", cshape); ur->add_do_method(node->get_parent(), "add_child", cshape);
ur->add_do_method(node->get_parent(), "move_child", cshape, node->get_index() + 1); ur->add_do_method(node->get_parent(), "move_child", cshape, node->get_index() + 1);
@ -218,7 +218,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
cshape->set_shape(shapes[i]); cshape->set_shape(shapes[i]);
cshape->set_transform(node->get_transform()); cshape->set_transform(node->get_transform());
Node *owner = node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
ur->add_do_method(node->get_parent(), "add_child", cshape); ur->add_do_method(node->get_parent(), "add_child", cshape);
ur->add_do_method(node->get_parent(), "move_child", cshape, node->get_index() + 1); ur->add_do_method(node->get_parent(), "move_child", cshape, node->get_index() + 1);
@ -241,7 +241,7 @@ void MeshInstanceEditor::_menu_option(int p_option) {
NavigationMeshInstance *nmi = memnew(NavigationMeshInstance); NavigationMeshInstance *nmi = memnew(NavigationMeshInstance);
nmi->set_navigation_mesh(nmesh); nmi->set_navigation_mesh(nmesh);
Node *owner = node == get_tree()->get_edited_scene_root() ? node : node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
ur->create_action(TTR("Create Navigation Mesh")); ur->create_action(TTR("Create Navigation Mesh"));
@ -419,10 +419,7 @@ void MeshInstanceEditor::_create_outline_mesh() {
MeshInstance *mi = memnew(MeshInstance); MeshInstance *mi = memnew(MeshInstance);
mi->set_mesh(mesho); mi->set_mesh(mesho);
Node *owner = node->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
if (get_tree()->get_edited_scene_root() == node) {
owner = node;
}
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();

2
editor/plugins/skeleton_editor_plugin.cpp
View file

@ -51,7 +51,7 @@ void SkeletonEditor::_on_click_option(int p_option) {
void SkeletonEditor::create_physical_skeleton() { void SkeletonEditor::create_physical_skeleton() {
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
Node *owner = skeleton == get_tree()->get_edited_scene_root() ? skeleton : skeleton->get_owner(); Node *owner = get_tree()->get_edited_scene_root();
const int bc = skeleton->get_bone_count(); const int bc = skeleton->get_bone_count();