diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-02-27 22:42:34 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-02-27 22:42:43 +0300 |
commit | 91abb70006866e651233ff44f0f275856a6bf65d (patch) | |
tree | 18b08c7bb03f334a97f53df639ea2dcc8f06925d /source/blender/editors/transform/transform_convert_sequencer.c | |
parent | c20caec7f0b39b7d15bd600880ea9534c31f6732 (diff) |
Transform: Remove 'mouse_coordinate_override' property
This property depends on the view that can change when redoing.
Diffstat (limited to 'source/blender/editors/transform/transform_convert_sequencer.c')
-rw-r--r-- | source/blender/editors/transform/transform_convert_sequencer.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index 4baf0e8a3cb..c11858b922a 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -31,8 +31,6 @@ #include "BKE_sequencer.h" #include "BKE_report.h" -#include "UI_view2d.h" - #include "transform.h" #include "transform_convert.h" @@ -526,14 +524,12 @@ void createTransSeqData(bContext *C, TransInfo *t) { #define XXX_DURIAN_ANIM_TX_HACK - View2D *v2d = UI_view2d_fromcontext(C); Scene *scene = t->scene; Editing *ed = BKE_sequencer_editing_get(t->scene, false); TransData *td = NULL; TransData2D *td2d = NULL; TransDataSeq *tdsq = NULL; TransSeq *ts = NULL; - int xmouse; int count = 0; @@ -545,18 +541,10 @@ void createTransSeqData(bContext *C, TransInfo *t) } tc->custom.type.free_cb = freeSeqData; - - xmouse = (int)UI_view2d_region_to_view_x(v2d, t->mouse.imval[0]); - - /* which side of the current frame should be allowed */ - if (t->mode == TFM_TIME_EXTEND) { - /* only side on which mouse is gets transformed */ - t->frame_side = (xmouse > CFRA) ? 'R' : 'L'; - } - else { - /* normal transform - both sides of current frame are considered */ - t->frame_side = 'B'; - } + /* only side on which center is gets transformed */ + float center[2]; + transform_convert_center_global_v2(t, center); + t->frame_side = (center[0] > CFRA) ? 'R' : 'L'; #ifdef XXX_DURIAN_ANIM_TX_HACK { @@ -599,7 +587,7 @@ void createTransSeqData(bContext *C, TransInfo *t) SeqTransDataBounds(t, ed->seqbasep, ts); /* set the snap mode based on how close the mouse is at the end/start points */ - if (abs(xmouse - ts->max) > abs(xmouse - ts->min)) { + if (abs(center[0] - ts->max) > abs(center[0] - ts->min)) { ts->snap_left = true; } |