sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T40529: Euler Rotation F-Curve Handlers wrong behaviour on moving keyframes

Browse Source
This commit is contained in:
Sergey Sharybin 2014-06-09 13:43:56 +06:00
parent 04c2e5d593
commit 0b5cd4b809
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/transform/transform_conversions.c
View File

@ -4101,8 +4101,8 @@ void flushTransGraphData(TransInfo *t)
a++, td++, td2d++, tdg++) a++, td++, td2d++, tdg++)
{ {
AnimData *adt = (AnimData *)td->extra; /* pointers to relevant AnimData blocks are stored in the td->extra pointers */ AnimData *adt = (AnimData *)td->extra; /* pointers to relevant AnimData blocks are stored in the td->extra pointers */
float unit_scale = tdg->unit_scale; float inv_unit_scale = 1.0f / tdg->unit_scale;
/* handle snapping for time values /* handle snapping for time values
* - we should still be in NLA-mapping timespace * - we should still be in NLA-mapping timespace
* - only apply to keyframes (but never to handles) * - only apply to keyframes (but never to handles)
@ -4159,16 +4159,16 @@ void flushTransGraphData(TransInfo *t)
if (td->flag & TD_INTVALUES) if (td->flag & TD_INTVALUES)
td2d->loc2d[1] = floorf(td2d->loc[1] + 0.5f); td2d->loc2d[1] = floorf(td2d->loc[1] + 0.5f);
else else
td2d->loc2d[1] = td2d->loc[1] / unit_scale; td2d->loc2d[1] = td2d->loc[1] * inv_unit_scale;
if ((td->flag & TD_MOVEHANDLE1) && td2d->h1) { if ((td->flag & TD_MOVEHANDLE1) && td2d->h1) {
td2d->h1[0] = td2d->ih1[0] + td->loc[0] - td->iloc[0]; td2d->h1[0] = td2d->ih1[0] + td->loc[0] - td->iloc[0];
td2d->h1[1] = td2d->ih1[1] + td->loc[1] - td->iloc[1]; td2d->h1[1] = td2d->ih1[1] + (td->loc[1] - td->iloc[1]) * inv_unit_scale;
} }
if ((td->flag & TD_MOVEHANDLE2) && td2d->h2) { if ((td->flag & TD_MOVEHANDLE2) && td2d->h2) {
td2d->h2[0] = td2d->ih2[0] + td->loc[0] - td->iloc[0]; td2d->h2[0] = td2d->ih2[0] + td->loc[0] - td->iloc[0];
td2d->h2[1] = td2d->ih2[1] + td->loc[1] - td->iloc[1]; td2d->h2[1] = td2d->ih2[1] + (td->loc[1] - td->iloc[1]) * inv_unit_scale;
} }
} }
} }