diff options
| author | SaracenOne <SaracenOne@gmail.com> | 2022-04-13 04:10:44 +0100 |
|---|---|---|
| committer | SaracenOne <SaracenOne@gmail.com> | 2022-04-13 04:39:01 +0100 |
| commit | f8cc2e054db5a34ad828da494484a53013b94767 (patch) | |
| tree | 39a1255a3f3d01a57e228165f910f6ac7ffa102b | |
| parent | 895f2a21f4beea6f4c89d33666bdf3b0925d6db7 (diff) | |
Ensure gizmos are added to newly created Node3D-derivatives and silence error for attempting to create gizmos twice
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | scene/3d/node_3d.cpp | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 855fc2b2a9..f2ca1fcfeb 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -7120,7 +7120,9 @@ void Node3DEditor::_request_gizmo(Object *p_obj) { } } } - sp->update_gizmos(); + if (!sp->get_gizmos().is_empty()) { + sp->update_gizmos(); + } } } diff --git a/scene/3d/node_3d.cpp b/scene/3d/node_3d.cpp index 62cc7c143b..bbc977647e 100644 --- a/scene/3d/node_3d.cpp +++ b/scene/3d/node_3d.cpp @@ -181,15 +181,6 @@ void Node3D::_notification(int p_what) { #ifdef TOOLS_ENABLED if (Engine::get_singleton()->is_editor_hint() && get_tree()->is_node_being_edited(this)) { get_tree()->call_group_flags(0, SceneStringNames::get_singleton()->_spatial_editor_group, SceneStringNames::get_singleton()->_request_gizmo, this); - if (!data.gizmos_disabled) { - for (int i = 0; i < data.gizmos.size(); i++) { - data.gizmos.write[i]->create(); - if (is_visible_in_tree()) { - data.gizmos.write[i]->redraw(); - } - data.gizmos.write[i]->transform(); - } - } } #endif } break; @@ -427,6 +418,7 @@ void Node3D::update_gizmos() { } if (data.gizmos.is_empty()) { + get_tree()->call_group_flags(0, SceneStringNames::get_singleton()->_spatial_editor_group, SceneStringNames::get_singleton()->_request_gizmo, this); return; } if (data.gizmos_dirty) { |