diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-25 21:01:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 21:01:24 +0200 |
| commit | fea72f2a7102dc0eec083bf5397330cb7a05de94 (patch) | |
| tree | 06bf9d2ca3c58434c118d5b8e1537f9c7fb797e2 | |
| parent | 41c735fe5016285a8f0ce1175c1e8c5ab8c451af (diff) | |
| parent | 6c6d072e3d67d86d149beb353854821828f5b914 (diff) | |
Merge pull request #42338 from godotengine/revert-41697-bug/editor-inspector-refresh-fix
Revert "Fix editor inspector refresh not working"
| -rw-r--r-- | editor/editor_inspector.cpp | 11 | ||||
| -rw-r--r-- | editor/editor_inspector.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 336e34298f..2e716a636e 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 = refresh_interval_cache; + refresh_countdown = EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval"); } Object *EditorInspector::get_edited_object() { @@ -2332,8 +2332,6 @@ 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) { @@ -2369,9 +2367,6 @@ void EditorInspector::_notification(int p_what) { } } } - } else { - // Restart countdown if <= 0 - refresh_countdown = refresh_interval_cache; } changing++; @@ -2404,9 +2399,6 @@ 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(); } } @@ -2570,7 +2562,6 @@ 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 d1046315f4..36b80a7dd4 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -294,7 +294,6 @@ class EditorInspector : public ScrollContainer { bool deletable_properties; float refresh_countdown; - float refresh_interval_cache; bool update_tree_pending; StringName _prop_edited; StringName property_selected; |