diff options
author | Juan Linietsky <reduzio@gmail.com> | 2019-01-18 13:01:24 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2019-01-18 13:01:24 -0300 |
commit | 541422a4a28c873142af9bfc988468b3e9e05948 (patch) | |
tree | aecc6e1115ad99e7088dc0c7a3225810fc13c4c9 /editor/plugins | |
parent | 580bebda520866e229cc52b937f371a9848086a3 (diff) |
Clean up and fix issues after merging #21701 , closes #21104
Diffstat (limited to 'editor/plugins')
4 files changed, 6 insertions, 6 deletions
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 62eac05cb7..13c80e5394 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -87,7 +87,7 @@ Size2 AnimationNodeBlendTreeEditor::get_minimum_size() const { return Size2(10, 200); } -void AnimationNodeBlendTreeEditor::_property_changed(const StringName &p_property, const Variant &p_value) { +void AnimationNodeBlendTreeEditor::_property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing) { AnimationTree *tree = AnimationTreeEditor::get_singleton()->get_tree(); updating = true; diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h index 6df62c33da..f2a77cecb4 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.h +++ b/editor/plugins/animation_blend_tree_editor_plugin.h @@ -104,7 +104,7 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin { void _filter_toggled(); Ref<AnimationNode> _filter_edit; - void _property_changed(const StringName &p_property, const Variant &p_value); + void _property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing); void _removed_from_graph(); EditorFileDialog *open_file; diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp index a19e715d87..326e8394a0 100644 --- a/editor/plugins/root_motion_editor_plugin.cpp +++ b/editor/plugins/root_motion_editor_plugin.cpp @@ -39,7 +39,7 @@ void EditorPropertyRootMotion::_confirmed() { return; NodePath path = ti->get_metadata(0); - emit_signal("property_changed", get_edited_property(), path); + emit_changed(get_edited_property(), path); update_property(); filter_dialog->hide(); //may come from activated } @@ -195,7 +195,7 @@ void EditorPropertyRootMotion::_node_assign() { void EditorPropertyRootMotion::_node_clear() { - emit_signal("property_changed", get_edited_property(), NodePath()); + emit_changed(get_edited_property(), NodePath()); update_property(); } diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index becee4d633..628c2f714c 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -964,7 +964,7 @@ public: class VisualShaderNodePluginDefaultEditor : public VBoxContainer { GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer) public: - void _property_changed(const String &prop, const Variant &p_value, bool p_changing = false) { + void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) { if (p_changing) return; @@ -1014,7 +1014,7 @@ public: } static void _bind_methods() { - ClassDB::bind_method("_property_changed", &VisualShaderNodePluginDefaultEditor::_property_changed, DEFVAL(false)); + ClassDB::bind_method("_property_changed", &VisualShaderNodePluginDefaultEditor::_property_changed, DEFVAL(String()), DEFVAL(false)); ClassDB::bind_method("_node_changed", &VisualShaderNodePluginDefaultEditor::_node_changed); ClassDB::bind_method("_refresh_request", &VisualShaderNodePluginDefaultEditor::_refresh_request); } |