summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editor/editor_inspector.cpp11
-rw-r--r--editor/editor_inspector.h1
2 files changed, 11 insertions, 1 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 2e716a636e..336e34298f 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -1969,7 +1969,7 @@ void EditorInspector::refresh() {
if (refresh_countdown > 0 || changing) {
return;
}
- refresh_countdown = EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval");
+ refresh_countdown = refresh_interval_cache;
}
Object *EditorInspector::get_edited_object() {
@@ -2332,6 +2332,8 @@ void EditorInspector::_node_removed(Node *p_node) {
void EditorInspector::_notification(int p_what) {
if (p_what == NOTIFICATION_READY) {
EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &EditorInspector::_feature_profile_changed));
+ refresh_interval_cache = EDITOR_GET("docks/property_editor/auto_refresh_interval");
+ refresh_countdown = refresh_interval_cache;
}
if (p_what == NOTIFICATION_ENTER_TREE) {
@@ -2367,6 +2369,9 @@ void EditorInspector::_notification(int p_what) {
}
}
}
+ } else {
+ // Restart countdown if <= 0
+ refresh_countdown = refresh_interval_cache;
}
changing++;
@@ -2399,6 +2404,9 @@ void EditorInspector::_notification(int p_what) {
add_theme_style_override("bg", get_theme_stylebox("bg", "Tree"));
}
+ refresh_interval_cache = EDITOR_GET("docks/property_editor/auto_refresh_interval");
+ refresh_countdown = refresh_interval_cache;
+
update_tree();
}
}
@@ -2562,6 +2570,7 @@ EditorInspector::EditorInspector() {
update_all_pending = false;
update_tree_pending = false;
refresh_countdown = 0;
+ refresh_interval_cache = 0;
read_only = false;
search_box = nullptr;
keying = false;
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 36b80a7dd4..d1046315f4 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -294,6 +294,7 @@ class EditorInspector : public ScrollContainer {
bool deletable_properties;
float refresh_countdown;
+ float refresh_interval_cache;
bool update_tree_pending;
StringName _prop_edited;
StringName property_selected;