[Bf-blender-cvs] [34b4dca9f12] master: Cleanup: Move TransSeq declaration to tansform_convert

[Germano Cavalcante]

Commit: 34b4dca9f124bffeb4de037e4d8704ee15abe86a
Author: Germano Cavalcante
Date:   Sat Jun 6 10:30:32 2020 -0300
Branches: master
https://developer.blender.org/rB34b4dca9f124bffeb4de037e4d8704ee15abe86a

Cleanup: Move TransSeq declaration to tansform_convert

===================================================================

M	source/blender/editors/transform/transform.h
M	source/blender/editors/transform/transform_convert.h
M	source/blender/editors/transform/transform_convert_sequencer.c
M	source/blender/editors/transform/transform_snap.c

===================================================================

diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 192728f63d2..4097e0c8f8c 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -229,16 +229,6 @@ typedef struct TransDataSeq {
 
 } TransDataSeq;
 
-/**
- * Sequencer transform customdata (stored in #TransCustomDataContainer).
- */
-typedef struct TransSeq {
-  TransDataSeq *tdseq;
-  int min;
-  int max;
-  bool snap_left;
-} TransSeq;
-
 /** Used for NLA transform (stored in #TransData.extra pointer). */
 typedef struct TransDataNla {
   /** ID-block NLA-data is attached to. */
diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h
index e5d758135e2..621c923675a 100644
--- a/source/blender/editors/transform/transform_convert.h
+++ b/source/blender/editors/transform/transform_convert.h
@@ -93,6 +93,7 @@ void flushTransParticles(TransInfo *t);
 
 /* transform_convert_sequencer.c */
 void flushTransSeq(TransInfo *t);
+int transform_convert_sequencer_get_snap_bound(TransInfo *t);
 
 /* transform_convert_tracking.c */
 void flushTransTracking(TransInfo *t);
diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c
index 0175bf6e673..deaf3689ceb 100644
--- a/source/blender/editors/transform/transform_convert_sequencer.c
+++ b/source/blender/editors/transform/transform_convert_sequencer.c
@@ -36,6 +36,16 @@
 #include "transform.h"
 #include "transform_convert.h"
 
+/**
+ * Sequencer transform customdata (stored in #TransCustomDataContainer).
+ */
+typedef struct TransSeq {
+  TransDataSeq *tdseq;
+  int min;
+  int max;
+  bool snap_left;
+} TransSeq;
+
 /* -------------------------------------------------------------------- */
 /** \name Sequencer Transform Creation
  *
@@ -760,4 +770,10 @@ void flushTransSeq(TransInfo *t)
   }
 }
 
+int transform_convert_sequencer_get_snap_bound(TransInfo *t)
+{
+  TransSeq *ts = TRANS_DATA_CONTAINER_FIRST_SINGLE(t)->custom.type.data;
+  return ts->snap_left ? ts->min : ts->max;
+}
+
 /** \} */
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(