summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorSilc Renew <tokage.it.lab@gmail.com>2022-12-28 14:54:40 +0900
committerSilc Renew <tokage.it.lab@gmail.com>2023-01-04 19:15:20 +0900
commiteee9e3cd9aef82ae7dde5bcacde2fd1e2d472cf7 (patch)
treef46618b5d26b1a673638b69d44b3f8ddc9e5a5bf /editor
parent0160fea1ced6697d5b72ad2f41332e8768080be4 (diff)
Revert "Merge pull request #68498 from Rindbee/improve-update_tree"
This reverts commit d5dc70a47871701fc61804b0b75362f5dcdf0055, reversing changes made to ccbefa1f4316c46eed35912e954fdf0e8c88c01a.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_inspector.cpp9
-rw-r--r--editor/editor_inspector.h2
2 files changed, 3 insertions, 8 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 9a3eb75416..e07c42e0ab 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -2586,7 +2586,7 @@ bool EditorInspector::_is_property_disabled_by_feature_profile(const StringName
return false;
}
-void EditorInspector::_update_tree() {
+void EditorInspector::update_tree() {
//to update properly if all is refreshed
StringName current_selected = property_selected;
int current_focusable = -1;
@@ -3305,10 +3305,6 @@ void EditorInspector::_update_tree() {
}
}
-void EditorInspector::update_tree() {
- update_tree_pending = true;
-}
-
void EditorInspector::update_property(const String &p_prop) {
if (!editor_property_map.has(p_prop)) {
return;
@@ -3906,9 +3902,10 @@ void EditorInspector::_notification(int p_what) {
changing++;
if (update_tree_pending) {
+ update_tree();
update_tree_pending = false;
pending.clear();
- _update_tree();
+
} else {
while (pending.size()) {
StringName prop = *pending.begin();
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 53490f0880..df8493308a 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -542,8 +542,6 @@ class EditorInspector : public ScrollContainer {
void _show_add_meta_dialog();
void _check_meta_name(const String &p_name);
- void _update_tree();
-
protected:
static void _bind_methods();
void _notification(int p_what);