From 91abb70006866e651233ff44f0f275856a6bf65d Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 27 Feb 2020 16:42:34 -0300 Subject: Transform: Remove 'mouse_coordinate_override' property This property depends on the view that can change when redoing. --- source/blender/editors/transform/transform_convert.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'source/blender/editors/transform/transform_convert.c') diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 027ae04795a..78e785e0e71 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -69,6 +69,8 @@ #include "ED_clip.h" #include "ED_mask.h" +#include "UI_view2d.h" + #include "WM_api.h" /* for WM_event_add_notifier to deal with stabilization nodes */ #include "WM_types.h" @@ -787,6 +789,19 @@ void clipUVData(TransInfo *t) /* ********************* ANIMATION EDITORS (GENERAL) ************************* */ +/* In modal, `t->center_global` may not have been inited yet. */ +void transform_convert_center_global_v2(TransInfo *t, float r_center[2]) +{ + /* In modal, `t->center2d` may not have been inited yet. */ + if (t->flag & T_MODAL) { + UI_view2d_region_to_view( + (View2D *)t->view, t->mouse.imval[0], t->mouse.imval[1], &r_center[0], &r_center[1]); + } + else { + copy_v2_v2(r_center, t->center_global); + } +} + /* This function tests if a point is on the "mouse" side of the cursor/frame-marking */ bool FrameOnMouseSide(char side, float frame, float cframe) { -- cgit v1.2.3 From e339c7798e09ddd4186ac8f3e7b6cc3442f8fbf9 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 27 Feb 2020 18:51:02 -0300 Subject: Cleanup: transform comments --- source/blender/editors/transform/transform_convert.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/transform/transform_convert.c') diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 78e785e0e71..87fd2f48ac0 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -789,10 +789,9 @@ void clipUVData(TransInfo *t) /* ********************* ANIMATION EDITORS (GENERAL) ************************* */ -/* In modal, `t->center_global` may not have been inited yet. */ +/* In modal, `t->center_global` may not have been setted yet. */ void transform_convert_center_global_v2(TransInfo *t, float r_center[2]) { - /* In modal, `t->center2d` may not have been inited yet. */ if (t->flag & T_MODAL) { UI_view2d_region_to_view( (View2D *)t->view, t->mouse.imval[0], t->mouse.imval[1], &r_center[0], &r_center[1]); -- cgit v1.2.3 From e98f94d778ef733201bafbdcacbbf630997380ad Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 28 Feb 2020 12:33:23 +1100 Subject: Cleanup: warnings using 'abs' on float values --- source/blender/editors/transform/transform_convert.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/transform/transform_convert.c') diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 87fd2f48ac0..c2e3c8ef508 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -789,7 +789,9 @@ void clipUVData(TransInfo *t) /* ********************* ANIMATION EDITORS (GENERAL) ************************* */ -/* In modal, `t->center_global` may not have been setted yet. */ +/** + * For modal operation: `t->center_global` may not have been set yet. + */ void transform_convert_center_global_v2(TransInfo *t, float r_center[2]) { if (t->flag & T_MODAL) { @@ -801,6 +803,14 @@ void transform_convert_center_global_v2(TransInfo *t, float r_center[2]) } } +void transform_convert_center_global_v2_int(TransInfo *t, int r_center[2]) +{ + float center[2]; + transform_convert_center_global_v2(t, center); + r_center[0] = round_fl_to_int(center[0]); + r_center[1] = round_fl_to_int(center[1]); +} + /* This function tests if a point is on the "mouse" side of the cursor/frame-marking */ bool FrameOnMouseSide(char side, float frame, float cframe) { @@ -2528,7 +2538,7 @@ void createTransData(bContext *C, TransInfo *t) t->obedit_type = -1; t->num.flag |= NUM_NO_FRACTION; /* sequencer has no use for floating point trasnform */ - createTransSeqData(C, t); + createTransSeqData(t); countAndCleanTransDataContainer(t); } else if (t->spacetype == SPACE_GRAPH) { -- cgit v1.2.3