Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-06-06 16:30:32 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-06-08 14:23:37 +0300
commit34b4dca9f124bffeb4de037e4d8704ee15abe86a (patch)
treee62b726230d780f5c270e1ca43c8a867cbe7e97c /source/blender/editors/transform/transform_snap.c
parent0e040ef3fb9af7e97e93190d250aecc0cb68b037 (diff)
Cleanup: Move TransSeq declaration to tansform_convert
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
-rw-r--r--source/blender/editors/transform/transform_snap.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 82602e7d828..c6d7b92fb42 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -72,6 +72,7 @@
#include "MEM_guardedalloc.h"
#include "transform.h"
+#include "transform_convert.h"
#include "transform_snap.h"
/* this should be passed as an arg for use in snap functions */
@@ -1615,26 +1616,22 @@ void snapGridIncrement(TransInfo *t, float *val)
void snapSequenceBounds(TransInfo *t, const int mval[2])
{
- float xmouse, ymouse;
- int frame;
- int mframe;
- TransSeq *ts = TRANS_DATA_CONTAINER_FIRST_SINGLE(t)->custom.type.data;
- /* reuse increment, strictly speaking could be another snap mode, but leave as is */
+ /* Reuse increment, strictly speaking could be another snap mode, but leave as is. */
if (!(t->modifiers & MOD_SNAP_INVERT)) {
return;
}
- /* convert to frame range */
+ /* Convert to frame range. */
+ float xmouse, ymouse;
UI_view2d_region_to_view(&t->region->v2d, mval[0], mval[1], &xmouse, &ymouse);
- mframe = round_fl_to_int(xmouse);
- /* now find the closest sequence */
- frame = BKE_sequencer_find_next_prev_edit(t->scene, mframe, SEQ_SIDE_BOTH, true, false, true);
+ const int frame_curr = round_fl_to_int(xmouse);
- if (!ts->snap_left) {
- frame = frame - (ts->max - ts->min);
- }
+ /* Now find the closest sequence. */
+ const int frame_near = BKE_sequencer_find_next_prev_edit(
+ t->scene, frame_curr, SEQ_SIDE_BOTH, true, false, true);
- t->values[0] = frame - ts->min;
+ const int frame_snap = transform_convert_sequencer_get_snap_bound(t);
+ t->values[0] = frame_near - frame_snap;
}
static void applyGridIncrement(