[Bf-blender-cvs] [96561dbdf04] master: Sculpt: enable 3D paint cursor for multires

Brecht Van Lommel noreply at git.blender.org
Tue Oct 1 16:15:39 CEST 2019


Commit: 96561dbdf04a7d994c9ecbcbc4acd84302976c69
Author: Brecht Van Lommel
Date:   Tue Oct 1 14:38:25 2019 +0200
Branches: master
https://developer.blender.org/rB96561dbdf04a7d994c9ecbcbc4acd84302976c69

Sculpt: enable 3D paint cursor for multires

===================================================================

M	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 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),



More information about the Bf-blender-cvs mailing list