summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhomer666 <homer666@users.noreply.github.com>2019-04-28 07:56:04 +1000
committerhomer666 <homer666@users.noreply.github.com>2019-04-28 09:31:53 +1000
commit62e02629510902ee51dd36a5d4dd7ddeec158831 (patch)
tree945ed2ceaa06ebea8904b355ed82d8028505d79a
parent876c509a9d171d71803857df3b263900b3d140da (diff)
Update edited keyframe's snap mode properly
-rw-r--r--editor/animation_track_editor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 2376d08077..def55d6057 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -544,7 +544,7 @@ public:
if (use_fps && animation->get_step() > 0) {
float max_frame = animation->get_length() / animation->get_step();
- p_list->push_back(PropertyInfo(Variant::REAL, "frame", PROPERTY_HINT_RANGE, "0," + rtos(max_frame) + ",0.01"));
+ p_list->push_back(PropertyInfo(Variant::REAL, "frame", PROPERTY_HINT_RANGE, "0," + rtos(max_frame) + ",1"));
} else {
p_list->push_back(PropertyInfo(Variant::REAL, "time", PROPERTY_HINT_RANGE, "0," + rtos(animation->get_length()) + ",0.01"));
}
@@ -4122,6 +4122,7 @@ void AnimationTrackEditor::_update_key_edit() {
key_edit = memnew(AnimationTrackKeyEdit);
key_edit->animation = animation;
key_edit->track = selection.front()->key().track;
+ key_edit->use_fps = timeline->is_using_fps();
float ofs = animation->track_get_key_time(key_edit->track, selection.front()->key().key);
key_edit->key_ofs = ofs;