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

Fix T39880: Cancelling transforms in Graph Editor does not restore F-Curves to original state

Browse Source 
Since autosnap was being applied during the flushing step for various practical reasons,
it wasn't possible to restore keyframes and handles to their original values, as these
would always get overwritten before getting a chance to be written back to the keyframes.
This commit is contained in:
Joshua Leung 2014-04-25 13:32:27 +12:00
parent b1932477a7
commit 3b75d6c4f9
2 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4107,8 +4107,9 @@ void flushTransGraphData(TransInfo *t)
/* 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)
* - don't do this when cancelling, or else these changes won't go away
*/ */
if ((td->flag & TD_NOTIMESNAP) == 0) { if ((t->state != TRANS_CANCEL) && (td->flag & TD_NOTIMESNAP) == 0) {
switch (sipo->autosnap) { switch (sipo->autosnap) {
case SACTSNAP_FRAME: /* snap to nearest frame */ case SACTSNAP_FRAME: /* snap to nearest frame */
td2d->loc[0] = floor((double)td2d->loc[0] + 0.5); td2d->loc[0] = floor((double)td2d->loc[0] + 0.5);
@ -4136,8 +4137,11 @@ void flushTransGraphData(TransInfo *t)
* *
* NOTE: We also have to apply to td->loc, as that's what the handle-adjustment step below looks * NOTE: We also have to apply to td->loc, as that's what the handle-adjustment step below looks
* to, otherwise we get "swimming handles" * to, otherwise we get "swimming handles"
* NOTE: We don't do this when cancelling transforms, or else these changes don't go away
*/ */
if ((td->flag & TD_NOTIMESNAP) == 0 && ELEM(sipo->autosnap, SACTSNAP_STEP, SACTSNAP_TSTEP)) { if ((t->state != TRANS_CANCEL) && (td->flag & TD_NOTIMESNAP) == 0 &&
ELEM(sipo->autosnap, SACTSNAP_STEP, SACTSNAP_TSTEP))
{
switch (sipo->autosnap) { switch (sipo->autosnap) {
case SACTSNAP_STEP: /* frame step */ case SACTSNAP_STEP: /* frame step */
td2d->loc2d[0] = floor((double)td2d->loc[0] + 0.5); td2d->loc2d[0] = floor((double)td2d->loc[0] + 0.5);

72
source/blender/editors/transform/transform_generics.c
View File

@ -529,41 +529,45 @@ static void recalcData_nla(TransInfo *t)
break; break;
} }
/* handle auto-snapping */ /* handle auto-snapping
switch (snla->autosnap) { * NOTE: only do this when transform is still running, or we can't restore
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 */ if (t->state != TRANS_CANCEL) {
{ switch (snla->autosnap) {
tdn->h1[0] = floorf(tdn->h1[0] + 0.5f); case SACTSNAP_FRAME: /* snap to nearest frame */
tdn->h2[0] = floorf(tdn->h2[0] + 0.5f); case SACTSNAP_STEP: /* frame step - this is basically the same, since we don't have any remapping going on */
break; {
} tdn->h1[0] = floorf(tdn->h1[0] + 0.5f);
tdn->h2[0] = floorf(tdn->h2[0] + 0.5f);
case SACTSNAP_SECOND: /* snap to nearest second */ break;
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
* the handles, things may not work correctly. Instead, we only snap
* the first handle, and move the other to fit.
*
* FIXME: we do run into problems here when user attempts to negatively
* scale the strip, as it then just compresses down and refuses
* to expand out the other end.
*/
float h1_new = (float)(floor(((double)tdn->h1[0] / secf) + 0.5) * secf);
float delta = h1_new - tdn->h1[0];
tdn->h1[0] = h1_new; case SACTSNAP_SECOND: /* snap to nearest second */
tdn->h2[0] += delta; case SACTSNAP_TSTEP: /* second step - this is basically the same, since we don't have any remapping going on */
break; {
} /* This case behaves differently from the rest, since lengths of strips
* may not be multiples of a second. If we just naively resize adjust
case SACTSNAP_MARKER: /* snap to nearest marker */ * the handles, things may not work correctly. Instead, we only snap
{ * the first handle, and move the other to fit.
tdn->h1[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h1[0]); *
tdn->h2[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h2[0]); * FIXME: we do run into problems here when user attempts to negatively
break; * scale the strip, as it then just compresses down and refuses
* to expand out the other end.
*/
float h1_new = (float)(floor(((double)tdn->h1[0] / secf) + 0.5) * secf);
float delta = h1_new - tdn->h1[0];
tdn->h1[0] = h1_new;
tdn->h2[0] += delta;
break;
}
case SACTSNAP_MARKER: /* snap to nearest marker */
{
tdn->h1[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h1[0]);
tdn->h2[0] = (float)ED_markers_find_nearest_marker_time(&t->scene->markers, tdn->h2[0]);
break;
}
} }
} }