From 1c6f8192e2db8622effa87095801132616f0de8b Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 23 Apr 2014 16:41:30 +1200 Subject: Applying same fix for snapping keyframes in Graph Editor --- source/blender/editors/space_graph/graph_edit.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 73b28f75048..14ceec577af 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -1968,11 +1968,16 @@ static void snap_graph_keys(bAnimContext *ac, short mode) /* snap keyframes */ for (ale = anim_data.first; ale; ale = ale->next) { AnimData *adt = ANIM_nla_mapping_get(ac, ale); - short mapping_flag = ANIM_get_normalization_flags(ac); - float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, ale->key_data, mapping_flag); - - ked.f1 = cursor_value / unit_scale; - + + /* normalise cursor value (for normalised F-Curves display) */ + if (mode == GRAPHKEYS_SNAP_VALUE) { + short mapping_flag = ANIM_get_normalization_flags(ac); + float unit_scale = ANIM_unit_mapping_get_factor(ac->scene, ale->id, ale->key_data, mapping_flag); + + ked.f1 = cursor_value / unit_scale; + } + + /* perform snapping */ if (adt) { ANIM_nla_mapping_apply_fcurve(adt, ale->key_data, 0, 1); ANIM_fcurve_keyframes_loop(&ked, ale->key_data, NULL, edit_cb, calchandles_fcurve); -- cgit v1.2.3