diff options
author | Jacques Lucke <jacques@blender.org> | 2021-08-20 13:42:11 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-08-20 13:42:11 +0300 |
commit | ea3ee04fa8ba4613007bfbed2206b9af9d3aaddd (patch) | |
tree | abea155262cb8711dba00b09953087c9e6a1cd79 /source/blender/editors/transform/transform_mode_timescale.c | |
parent | 48384363875dead78d63db69e8e82f91f3cb1361 (diff) | |
parent | 7d8c71e8003ecb4d3a7fe2483a328d3f2d184faa (diff) |
Merge branch 'master' into temp-geometry-nodes-fields-prototype
Diffstat (limited to 'source/blender/editors/transform/transform_mode_timescale.c')
-rw-r--r-- | source/blender/editors/transform/transform_mode_timescale.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_mode_timescale.c b/source/blender/editors/transform/transform_mode_timescale.c index 98ffc0abbd4..50fd714727b 100644 --- a/source/blender/editors/transform/transform_mode_timescale.c +++ b/source/blender/editors/transform/transform_mode_timescale.c @@ -40,6 +40,8 @@ #include "transform.h" #include "transform_convert.h" +#include "transform_snap.h" + #include "transform_mode.h" /* -------------------------------------------------------------------- */ @@ -63,7 +65,6 @@ static void headerTimeScale(TransInfo *t, char str[UI_MAX_DRAW_STR]) static void applyTimeScaleValue(TransInfo *t, float value) { Scene *scene = t->scene; - const short autosnap = getAnimEdit_SnapMode(t); FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; @@ -87,9 +88,6 @@ static void applyTimeScaleValue(TransInfo *t, float value) /* now, calculate the new value */ *(td->val) = ((td->ival - startx) * fac) + startx; - - /* apply nearest snapping */ - doAnimEdit_SnapFrame(t, td, td2d, adt, autosnap); } } } |