Merge commit godotengine/godot@cb411fa960f0b7fdbd97dcdb4c90f9346360ee0e

1 files changed, 7 insertions, 0 deletions

diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 8cc59920c4..b3533d2f75 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -602,6 +602,8 @@ class AnimationTrackEditor : public VBoxContainer {
 	AnimationMarkerEdit *marker_edit = nullptr;
 	HSlider *zoom = nullptr;
 	EditorSpinSlider *step = nullptr;
+	Button *fps_compat = nullptr;
+	Label *nearest_fps_label = nullptr;
 	TextureRect *zoom_icon = nullptr;
 	Button *snap_keys = nullptr;
 	Button *snap_timeline = nullptr;
@@ -639,6 +641,8 @@ class AnimationTrackEditor : public VBoxContainer {
 	void _track_grab_focus(int p_track);
 
 	void _update_scroll(double);
+	void _update_nearest_fps_label();
+	void _update_fps_compat_mode(bool p_enabled);
 	void _update_step(double p_new_step);
 	void _update_length(double p_new_len);
 	void _dropped_track(int p_from_track, int p_to_track);
@@ -855,6 +859,8 @@ class AnimationTrackEditor : public VBoxContainer {
 	void _pick_track_select_recursive(TreeItem *p_item, const String &p_filter, Vector<Node *> &p_select_candidates);
 
 	double snap_unit;
+	bool fps_compatible = true;
+	int nearest_fps = 0;
 	void _update_snap_unit();
 
 protected:
@@ -937,6 +943,7 @@ public:
 	bool can_add_reset_key() const;
 	float get_moving_selection_offset() const;
 	float snap_time(float p_value, bool p_relative = false);
+	float get_snap_unit();
 	bool is_grouping_tracks();
 	PackedStringArray get_selected_section() const;
 	bool is_marker_selected(const StringName &p_marker) const;