Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2014-04-24 19:01:55 +0400
committerJoshua Leung <aligorith@gmail.com>2014-04-24 19:14:04 +0400
commitadf1834ede0f234c60ee990daaa32f40e32f3b41 (patch)
tree2830723abdb893c3e97e6eba79090c25a3dea370 /source/blender/editors/transform/transform_generics.c
parent9f4ad8014c91f74f01374aa7eb11fc3e4a6b9160 (diff)
AutoSnap Bugfixes: NLA Frame/Second Step didn't work
Since the NLA was also using the standard transform mode by default, this meant that no frame/second step-snapping was happening here (i.e. like for the Graph Editor). The actual differences between doing true stepping vs nearest here are quite small (and don't really make much sense with NLA Strips), so for now, it should be fine that these are the same.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 0ff9f92db4e..90dc0876819 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -532,6 +532,7 @@ static void recalcData_nla(TransInfo *t)
/* handle auto-snapping */
switch (snla->autosnap) {
case SACTSNAP_FRAME: /* snap to nearest frame */
+ case SACTSNAP_STEP: /* frame step - this is basically the same, since we don't have any remapping going on */
{
tdn->h1[0] = floorf(tdn->h1[0] + 0.5f);
tdn->h2[0] = floorf(tdn->h2[0] + 0.5f);
@@ -539,6 +540,7 @@ static void recalcData_nla(TransInfo *t)
}
case SACTSNAP_SECOND: /* snap to nearest second */
+ case SACTSNAP_TSTEP: /* second step - this is basically the same, since we don't have any remapping going on */
{
/* This case behaves differently from the rest, since lengths of strips
* may not be multiples of a second. If we just naively resize adjust