From 8b24d0a2e9e20f77b5caf57531760a6baffac40c Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Fri, 25 Apr 2014 02:37:26 +1200 Subject: AutoSnap Bugfixes: NLA Editor - Nearest Frame/Second Split off handling for nearest second from nearest frame --- source/blender/editors/transform/transform_generics.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 4ee9f6bd6a6..98f6d50bc36 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 */ -- cgit v1.2.3