From 04ef62177fb6483dd1424486b8d7ddf994f62204 Mon Sep 17 00:00:00 2001 From: William Reynish Date: Mon, 30 Sep 2019 13:33:54 +0200 Subject: UI: Use paint crosshair cursor in all paint & sculpt modes Currently, we use the crosshair cursor in Sculpt mode, but not in the other paint modes. - Sculpt Mode: This crosshair cursor is too weighty. - Texture, Weight, Vertex Paint: Using the arrow cursor for painting is not right. This commit makes the following changes: - Use the new special paint crosshair instead - Use this cursor in all paint modes, not just Sculpt Reviewed by: Brecht Differential Revision: https://developer.blender.org/D5940 --- source/blender/editors/sculpt_paint/paint_cursor.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_cursor.c') diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 1f706d2f169..411710635d6 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1361,19 +1361,13 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) is_cursor_over_mesh = sculpt_cursor_geometry_info_update( C, &gi, mouse, !(brush->falloff_shape & BRUSH_AIRBRUSH)); } + /* Use special paint crosshair cursor in all paint modes*/ + wmWindow *win = CTX_wm_window(C); + WM_cursor_set(win, WM_CURSOR_CROSSA); if ((mode == PAINT_MODE_SCULPT) && ss && !is_multires && !(brush->falloff_shape & BRUSH_AIRBRUSH)) { Sculpt *sd = CTX_data_tool_settings(C)->sculpt; - wmWindow *win = CTX_wm_window(C); - - /* Update WM mouse cursor, disable when the 3D brush cursor is enabled */ - if (sd->paint.brush->overlay_flags & BRUSH_OVERLAY_CURSOR) { - WM_cursor_set(win, WM_CURSOR_DEFAULT); - } - else { - WM_cursor_set(win, WM_CURSOR_EDIT); - } if (!ups->stroke_active) { bool update_previews = false; -- cgit v1.2.3