summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorDualMatrix <piet.goris@gmail.com>2018-11-08 21:46:34 +0100
committerDualMatrix <piet.goris@gmail.com>2018-11-08 21:46:34 +0100
commit8286975d16130466cef2b71f3f0e735ec880ca3d (patch)
treec77ef2d365109f82e46481aaad75335bf2e8e041 /editor
parent531dc2f435c1d64a2e3ef0710cc05a7c13969587 (diff)
Made AnimationPlayer timeline only advance when keyframing frame variables
Fixes #23330
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_inspector.cpp10
-rw-r--r--editor/editor_inspector.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index 8be4a118e6..d6f337cc20 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -626,7 +626,7 @@ void EditorProperty::_gui_input(const Ref<InputEvent> &p_event) {
}
if (keying_rect.has_point(mb->get_position())) {
- emit_signal("property_keyed", property);
+ emit_signal("property_keyed", property, use_keying_next());
if (use_keying_next()) {
call_deferred("emit_signal", "property_changed", property, object->get(property).operator int64_t() + 1);
@@ -2030,20 +2030,20 @@ void EditorInspector::_multiple_properties_changed(Vector<String> p_paths, Array
changing--;
}
-void EditorInspector::_property_keyed(const String &p_path) {
+void EditorInspector::_property_keyed(const String &p_path, bool p_advance) {
if (!object)
return;
- emit_signal("property_keyed", p_path, object->get(p_path), true); //second param is deprecated
+ emit_signal("property_keyed", p_path, object->get(p_path), p_advance); //second param is deprecated
}
-void EditorInspector::_property_keyed_with_value(const String &p_path, const Variant &p_value) {
+void EditorInspector::_property_keyed_with_value(const String &p_path, const Variant &p_value, bool p_advance) {
if (!object)
return;
- emit_signal("property_keyed", p_path, p_value, false); //second param is deprecated
+ emit_signal("property_keyed", p_path, p_value, p_advance); //second param is deprecated
}
void EditorInspector::_property_checked(const String &p_path, bool p_checked) {
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 57d1ab6fb3..00841178bd 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -295,8 +295,8 @@ class EditorInspector : public ScrollContainer {
void _property_changed(const String &p_path, const Variant &p_value, bool changing = false);
void _property_changed_update_all(const String &p_path, const Variant &p_value);
void _multiple_properties_changed(Vector<String> p_paths, Array p_values);
- void _property_keyed(const String &p_path);
- void _property_keyed_with_value(const String &p_path, const Variant &p_value);
+ 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);
void _property_checked(const String &p_path, bool p_checked);