Skip to content

Commit 16d3ba7

Browse files
committed
Merge pull request godotengine#111589 from KoBeWi/notification_not_signal
Fix wrong EditorSettings usage in 3D editor
2 parents fb03c9c + f722513 commit 16d3ba7

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

editor/scene/3d/node_3d_editor_plugin.cpp

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6381,8 +6381,6 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
63816381

63826382
view_type = VIEW_TYPE_USER;
63836383
_update_name();
6384-
6385-
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view));
63866384
}
63876385

63886386
Node3DEditorViewport::~Node3DEditorViewport() {
@@ -8366,12 +8364,6 @@ void Node3DEditor::update_gizmo_opacity() {
83668364
}
83678365
}
83688366

8369-
void Node3DEditor::_on_editor_settings_changed() {
8370-
if (EditorSettings::get_singleton()->get_changed_settings().has("editors/3d/manipulator_gizmo_opacity")) {
8371-
update_gizmo_opacity();
8372-
}
8373-
}
8374-
83758367
void Node3DEditor::update_grid() {
83768368
const Camera3D::ProjectionType current_projection = viewports[0]->camera->get_projection();
83778369

@@ -8825,7 +8817,6 @@ void Node3DEditor::_notification(int p_what) {
88258817
environ_state->set_custom_minimum_size(environ_vb->get_combined_minimum_size());
88268818

88278819
ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::update_all_gizmos).bind(Variant()));
8828-
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::_on_editor_settings_changed));
88298820
} break;
88308821

88318822
case NOTIFICATION_ACCESSIBILITY_UPDATE: {
@@ -8846,7 +8837,6 @@ void Node3DEditor::_notification(int p_what) {
88468837

88478838
case NOTIFICATION_EXIT_TREE: {
88488839
_finish_indicators();
8849-
EditorSettings::get_singleton()->disconnect("settings_changed", callable_mp(this, &Node3DEditor::_on_editor_settings_changed));
88508840
} break;
88518841

88528842
case NOTIFICATION_THEME_CHANGED: {
@@ -8874,6 +8864,11 @@ void Node3DEditor::_notification(int p_what) {
88748864
// Update grid color by rebuilding grid.
88758865
_finish_grid();
88768866
_init_grid();
8867+
8868+
for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
8869+
viewports[i]->update_transform_gizmo_view();
8870+
}
8871+
update_gizmo_opacity();
88778872
}
88788873
} break;
88798874

editor/scene/3d/node_3d_editor_plugin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,6 @@ class Node3DEditor : public VBoxContainer {
826826
HashMap<Control *, VSeparator *> context_toolbar_separators;
827827

828828
void _update_context_toolbar();
829-
void _on_editor_settings_changed();
830829

831830
void _generate_selection_boxes();
832831

0 commit comments

Comments
 (0)