diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_curve.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_curve.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 8a98b15088f..4578e211c97 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -196,7 +196,7 @@ static void paintcurve_point_add(bContext *C, wmOperator *op, const int loc[2]) PaintCurve *pc; PaintCurvePoint *pcp; wmWindow *window = CTX_wm_window(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); float vec[3] = {loc[0], loc[1], 0.0}; int add_index; int i; @@ -250,7 +250,7 @@ static void paintcurve_point_add(bContext *C, wmOperator *op, const int loc[2]) ED_paintcurve_undo_push_end(); - WM_paint_cursor_tag_redraw(window, ar); + WM_paint_cursor_tag_redraw(window, region); } static int paintcurve_add_point_invoke(bContext *C, wmOperator *op, const wmEvent *event) @@ -309,7 +309,7 @@ static int paintcurve_delete_point_exec(bContext *C, wmOperator *op) PaintCurve *pc; PaintCurvePoint *pcp; wmWindow *window = CTX_wm_window(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); int i; int tot_del = 0; pc = br->paint_curve; @@ -361,7 +361,7 @@ static int paintcurve_delete_point_exec(bContext *C, wmOperator *op) ED_paintcurve_undo_push_end(); - WM_paint_cursor_tag_redraw(window, ar); + WM_paint_cursor_tag_redraw(window, region); return OPERATOR_FINISHED; } @@ -385,7 +385,7 @@ static bool paintcurve_point_select( bContext *C, wmOperator *op, const int loc[2], bool toggle, bool extend) { wmWindow *window = CTX_wm_window(C); - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Paint *p = BKE_paint_get_active_from_context(C); Brush *br = p->brush; PaintCurve *pc; @@ -477,7 +477,7 @@ static bool paintcurve_point_select( ED_paintcurve_undo_push_end(); - WM_paint_cursor_tag_redraw(window, ar); + WM_paint_cursor_tag_redraw(window, region); return true; } @@ -586,7 +586,7 @@ static int paintcurve_slide_invoke(bContext *C, wmOperator *op, const wmEvent *e } if (pcp) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); wmWindow *window = CTX_wm_window(C); PointSlideData *psd = MEM_mallocN(sizeof(PointSlideData), "PointSlideData"); copy_v2_v2_int(psd->initial_loc, event->mval); @@ -609,7 +609,7 @@ static int paintcurve_slide_invoke(bContext *C, wmOperator *op, const wmEvent *e BKE_paint_curve_clamp_endpoint_add_index(pc, pcp - pc->points); WM_event_add_modal_handler(C, op); - WM_paint_cursor_tag_redraw(window, ar); + WM_paint_cursor_tag_redraw(window, region); return OPERATOR_RUNNING_MODAL; } @@ -629,7 +629,7 @@ static int paintcurve_slide_modal(bContext *C, wmOperator *op, const wmEvent *ev switch (event->type) { case MOUSEMOVE: { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); wmWindow *window = CTX_wm_window(C); float diff[2] = {event->mval[0] - psd->initial_loc[0], event->mval[1] - psd->initial_loc[1]}; if (psd->select == 1) { @@ -648,7 +648,7 @@ static int paintcurve_slide_modal(bContext *C, wmOperator *op, const wmEvent *ev add_v2_v2v2(psd->pcp->bez.vec[opposite], psd->pcp->bez.vec[1], diff); } } - WM_paint_cursor_tag_redraw(window, ar); + WM_paint_cursor_tag_redraw(window, region); break; } default: @@ -727,7 +727,7 @@ static int paintcurve_cursor_invoke(bContext *C, wmOperator *UNUSED(op), const w switch (mode) { case PAINT_MODE_TEXTURE_2D: { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceImage *sima = CTX_wm_space_image(C); float location[2]; @@ -736,7 +736,7 @@ static int paintcurve_cursor_invoke(bContext *C, wmOperator *UNUSED(op), const w } UI_view2d_region_to_view( - &ar->v2d, event->mval[0], event->mval[1], &location[0], &location[1]); + ®ion->v2d, event->mval[0], event->mval[1], &location[0], &location[1]); copy_v2_v2(sima->cursor, location); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_IMAGE, NULL); break; |