diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-27 17:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 17:58:12 +0100 |
| commit | 86e1de71dfc7280446c472c9109515cd9d55d23e (patch) | |
| tree | 9ad2881975b06155ab01b9fb42e538419da3452b /editor | |
| parent | a08906112077df67407765e7319068d03d36961b (diff) | |
| parent | 563139e5f38ac233dd4e395df0b34394ebceb05b (diff) | |
Merge pull request #25383 from akien-mga/editorinspector-property_changed_update_all
Fix EditorInspector property_changed argument mismatch
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_inspector.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_inspector.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index d7e0302478..1078fabc2e 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2010,7 +2010,7 @@ void EditorInspector::_property_changed(const String &p_path, const Variant &p_v } } -void EditorInspector::_property_changed_update_all(const String &p_path, const Variant &p_value) { +void EditorInspector::_property_changed_update_all(const String &p_path, const Variant &p_value, const String &p_name, bool p_changing) { update_tree(); } diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 4fb3198e87..3d22cdb9a3 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -302,7 +302,7 @@ class EditorInspector : public ScrollContainer { void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field); void _property_changed(const String &p_path, const Variant &p_value, const String &p_name = "", bool changing = false); - void _property_changed_update_all(const String &p_path, const Variant &p_value); + void _property_changed_update_all(const String &p_path, const Variant &p_value, const String &p_name = "", bool p_changing = false); void _multiple_properties_changed(Vector<String> p_paths, Array p_values); void _property_keyed(const String &p_path, bool p_advance); void _property_keyed_with_value(const String &p_path, const Variant &p_value, bool p_advance); |