diff options
| author | mano-wii <germano.costa@ig.com.br> | 2020-02-15 18:09:23 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2020-02-15 18:09:23 +0300 |
| commit | de9ea94fc6f810b101742a4c2b839fb748e95be0 (patch) | |
| tree | 0a8fcca4e459fff0614332d415b557ca9cd3c1bf /source/blender/editors/transform/transform_mode.c | |
| parent | f0c991a380e9d449ebc02cc91649ef3728848070 (diff) | |
Transform: Deduplicate time snap code
Diffstat (limited to 'source/blender/editors/transform/transform_mode.c')
| -rw-r--r-- | source/blender/editors/transform/transform_mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_mode.c b/source/blender/editors/transform/transform_mode.c index 2368e0f0dc4..e681b649451 100644 --- a/source/blender/editors/transform/transform_mode.c +++ b/source/blender/editors/transform/transform_mode.c @@ -1063,11 +1063,11 @@ short getAnimEdit_SnapMode(TransInfo *t) void doAnimEdit_SnapFrame( TransInfo *t, TransData *td, TransData2D *td2d, AnimData *adt, short autosnap) { - if (ELEM(autosnap, SACTSNAP_FRAME, SACTSNAP_SECOND, SACTSNAP_MARKER)) { + if (autosnap != SACTSNAP_OFF) { float val; /* convert frame to nla-action time (if needed) */ - if (adt) { + if (adt && (t->spacetype != SPACE_SEQ)) { val = BKE_nla_tweakedit_remap(adt, *(td->val), NLATIME_CONVERT_MAP); } else { @@ -1077,7 +1077,7 @@ void doAnimEdit_SnapFrame( snapFrameTransform(t, autosnap, true, val, &val); /* convert frame out of nla-action time */ - if (adt) { + if (adt && (t->spacetype != SPACE_SEQ)) { *(td->val) = BKE_nla_tweakedit_remap(adt, val, NLATIME_CONVERT_UNMAP); } else { |