Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-22 17:17:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong owner for editor plugin created nodes in instanced scene

Browse Source
This commit is contained in:
Haoyu Qiu 2022-10-20 15:06:17 +08:00 committed by Relintai
parent 3e937eab15
commit 7ee4ed4647
1 changed files with 7 additions and 10 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

@ -102,7 +102,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);
@ -137,7 +137,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);
@ -166,7 +166,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();
@ -209,7 +209,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);
@ -244,7 +244,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);
@ -267,7 +267,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"));
@ -429,10 +429,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();