diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 15:38:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-01 17:10:38 +0300 |
| commit | 96561dbdf04a7d994c9ecbcbc4acd84302976c69 (patch) | |
| tree | 72be46c244ffa669805c6a4300fbeb6a7fddc7d7 /source | |
| parent | 2090b3e5ac41b5f5dffcdbd3d4c4b5ac0b84473d (diff) | |
Sculpt: enable 3D paint cursor for multires
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 82975b2b0fb..774d4ef09b1 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1365,8 +1365,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) wmWindow *win = CTX_wm_window(C); WM_cursor_set(win, WM_CURSOR_PAINT); - if ((mode == PAINT_MODE_SCULPT) && ss && !is_multires && - !(brush->falloff_shape & BRUSH_AIRBRUSH)) { + if ((mode == PAINT_MODE_SCULPT) && ss && !(brush->falloff_shape & BRUSH_AIRBRUSH)) { Sculpt *sd = CTX_data_tool_settings(C)->sculpt; if (!ups->stroke_active) { @@ -1438,7 +1437,8 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) /* Update and draw dynamic mesh preview lines */ GPU_matrix_push(); GPU_matrix_mul(vc.obact->obmat); - if (brush->sculpt_tool == SCULPT_TOOL_GRAB && brush->flag & BRUSH_GRAB_ACTIVE_VERTEX) { + if (brush->sculpt_tool == SCULPT_TOOL_GRAB && (brush->flag & BRUSH_GRAB_ACTIVE_VERTEX) && + !is_multires) { if (BKE_pbvh_type(ss->pbvh) == PBVH_FACES && ss->modifiers_active) { sculpt_geometry_preview_lines_update(C, ss, rds); sculpt_geometry_preview_lines_draw(pos, ss); @@ -1490,7 +1490,8 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) pos, ar, cursor_location, sd, vc.obact, ss->cache->radius); /* Draw cached dynamic mesh preview lines */ - if (brush->sculpt_tool == SCULPT_TOOL_GRAB && brush->flag & BRUSH_GRAB_ACTIVE_VERTEX) { + if (brush->sculpt_tool == SCULPT_TOOL_GRAB && (brush->flag & BRUSH_GRAB_ACTIVE_VERTEX) && + !is_multires) { if (BKE_pbvh_type(ss->pbvh) == PBVH_FACES && ss->modifiers_active) { GPU_matrix_push_projection(); ED_view3d_draw_setup_view(CTX_wm_window(C), |