[Bf-blender-cvs] [1c6f819] master: Applying same fix for snapping keyframes in Graph Editor

Joshua Leung noreply at git.blender.org
Wed Apr 23 06:50:15 CEST 2014


Commit: 1c6f8192e2db8622effa87095801132616f0de8b
Author: Joshua Leung
Date:   Wed Apr 23 16:41:30 2014 +1200
https://developer.blender.org/rB1c6f8192e2db8622effa87095801132616f0de8b

Applying same fix for snapping keyframes in Graph Editor

===================================================================

M	source/blender/editors/space_graph/graph_edit.c

===================================================================

diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 73b28f7..14ceec5 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);




More information about the Bf-blender-cvs mailing list