[Bf-blender-cvs] [8b24d0a] master: AutoSnap Bugfixes: NLA Editor - Nearest Frame/Second

[Joshua Leung]

Commit: 8b24d0a2e9e20f77b5caf57531760a6baffac40c
Author: Joshua Leung
Date:   Fri Apr 25 02:37:26 2014 +1200
https://developer.blender.org/rB8b24d0a2e9e20f77b5caf57531760a6baffac40c

AutoSnap Bugfixes: NLA Editor - Nearest Frame/Second

Split off handling for nearest second from nearest frame

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

M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 4ee9f6b..98f6d50 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -531,15 +531,14 @@ static void recalcData_nla(TransInfo *t)
 		
 		/* handle auto-snapping */
 		switch (snla->autosnap) {
-			case SACTSNAP_FRAME: /* snap to nearest frame/time  */
-				if (snla->flag & SNLA_DRAWTIME) {
-					tdn->h1[0] = (float)(floor(((double)tdn->h1[0] / secf) + 0.5) * secf);
-					tdn->h2[0] = (float)(floor(((double)tdn->h2[0] / secf) + 0.5) * secf);
-				}
-				else {
-					tdn->h1[0] = floorf(tdn->h1[0] + 0.5f);
-					tdn->h2[0] = floorf(tdn->h2[0] + 0.5f);
-				}
+			case SACTSNAP_FRAME: /* snap to nearest frame */
+				tdn->h1[0] = floorf(tdn->h1[0] + 0.5f);
+				tdn->h2[0] = floorf(tdn->h2[0] + 0.5f);
+				break;
+				
+			case SACTSNAP_SECOND: /* snap to nearest second */
+				tdn->h1[0] = (float)(floor(((double)tdn->h1[0] / secf) + 0.5) * secf);
+				tdn->h2[0] = (float)(floor(((double)tdn->h2[0] / secf) + 0.5) * secf);
 				break;
 			
 			case SACTSNAP_MARKER: /* snap to nearest marker */