godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update edited keyframe's snap mode properly 

(cherry picked from commit 62e0262951)
This commit is contained in:
homer666 2019-04-28 07:56:04 +10:00 committed by Rémi Verschelde
parent 4f09d433d8
commit 918e120da3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/animation_track_editor.cpp
View File

@ -544,7 +544,7 @@ public:
if (use_fps && animation->get_step() > 0) { if (use_fps && animation->get_step() > 0) {
float max_frame = animation->get_length() / animation->get_step(); 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 { } else {
p_list->push_back(PropertyInfo(Variant::REAL, "time", PROPERTY_HINT_RANGE, "0," + rtos(animation->get_length()) + ",0.01")); 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 = memnew(AnimationTrackKeyEdit);
key_edit->animation = animation; key_edit->animation = animation;
key_edit->track = selection.front()->key().track; 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); float ofs = animation->track_get_key_time(key_edit->track, selection.front()->key().key);
key_edit->key_ofs = ofs; key_edit->key_ofs = ofs;