Pārlūkot izejas kodu

Made AnimationPlayer timeline only advance when keyframing frame variables

Fixes #23330
DualMatrix 6 gadi atpakaļ
vecāks
revīzija
8286975d16
2 mainītis faili ar 7 papildinājumiem un 7 dzēšanām
  1. 5 5
      editor/editor_inspector.cpp
  2. 2 2
      editor/editor_inspector.h

+ 5 - 5
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())) {
 		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()) {
 			if (use_keying_next()) {
 				call_deferred("emit_signal", "property_changed", property, object->get(property).operator int64_t() + 1);
 				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--;
 	changing--;
 }
 }
 
 
-void EditorInspector::_property_keyed(const String &p_path) {
+void EditorInspector::_property_keyed(const String &p_path, bool p_advance) {
 
 
 	if (!object)
 	if (!object)
 		return;
 		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)
 	if (!object)
 		return;
 		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) {
 void EditorInspector::_property_checked(const String &p_path, bool p_checked) {

+ 2 - 2
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(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 _property_changed_update_all(const String &p_path, const Variant &p_value);
 	void _multiple_properties_changed(Vector<String> p_paths, Array p_values);
 	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);
 	void _property_checked(const String &p_path, bool p_checked);