From b5169cd2301a021a367fcaee69aa66c262565bb3 Mon Sep 17 00:00:00 2001 From: Pablo Dobarro Date: Wed, 21 Oct 2020 22:53:50 +0200 Subject: Fix T81932: Dyntopo crashing with sculpt vertex colors brush tools Paint and smear tools are only implemented for regular mesh PBVH, meaning they are not supported by the dynamic topology and multires sculpting. These tools are to be ignored for an unsupported sculpt modes, regardless of state of user preferences. Reviewed By: sergey Maniphest Tasks: T81932 Differential Revision: https://developer.blender.org/D9308 --- source/blender/editors/sculpt_paint/sculpt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index adc62b23559..3ffa2091560 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -5666,15 +5666,11 @@ static void do_brush_action(Sculpt *sd, Object *ob, Brush *brush, UnifiedPaintSe /* Check for unsupported features. */ PBVHType type = BKE_pbvh_type(ss->pbvh); if (brush->sculpt_tool == SCULPT_TOOL_PAINT && type != PBVH_FACES) { - if (!U.experimental.use_sculpt_vertex_colors) { - return; - } + return; } if (brush->sculpt_tool == SCULPT_TOOL_SMEAR && type != PBVH_FACES) { - if (!U.experimental.use_sculpt_vertex_colors) { - return; - } + return; } /* Build a list of all nodes that are potentially within the brush's area of influence */ -- cgit v1.2.3