blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Animation: Move Snapping to Scene #109015

Merged
Christoph Lendenfeld merged 35 commits from ChrisLend/blender:frame_snapping into main 2023-09-05 10:07:02 +02:00
Conversation 18 Commits 35 Files Changed 22 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5207ce573 - Show all commits

2
source/blender/editors/transform/transform_convert_action.cc
View File

@ -627,7 +627,7 @@ static void recalcData_actedit(TransInfo *t)
TransData2D *td2d;
int i = 0;
for (td = tc->data, td2d = tc->data_2d; i < tc->data_len; i++, td++, td2d++) {
if (t->tsnap.flag && (t->state != TRANS_CANCEL) && !(td->flag & TD_NOTIMESNAP)) {
if ((t->tsnap.flag & SCE_SNAP) && (t->state != TRANS_CANCEL) && !(td->flag & TD_NOTIMESNAP)) {
transform_snap_anim_flush_data(t, td, snap_mode, td->loc);
}

2
source/blender/editors/transform/transform_convert_graph.cc
View File

@ -674,7 +674,7 @@ static void flushTransGraphData(TransInfo *t)
* - Only apply to keyframes (but never to handles).
* - Don't do this when canceling, or else these changes won't go away.
*/
if (t->tsnap.flag && (t->state != TRANS_CANCEL) && !(td->flag & TD_NOTIMESNAP)) {
if ((t->tsnap.flag & SCE_SNAP) && (t->state != TRANS_CANCEL) && !(td->flag & TD_NOTIMESNAP)) {
transform_snap_anim_flush_data(t, td, snap_mode, td->loc);
}

2
source/blender/editors/transform/transform_convert_nla.cc
View File

@ -641,7 +641,7 @@ static void recalcData_nla(TransInfo *t)
* NOTE: only do this when transform is still running, or we can't restore
*/
if (t->state != TRANS_CANCEL) {
if (t->tsnap.flag) {
if (t->tsnap.flag & SCE_SNAP) {
eSnapMode autosnap = t->tsnap.mode;
TransData *td = tc->data;
for (int i = 0; i < tc->data_len; i++, td++) {