From a8e749f624a847149658d763cf1168dfd4fc2f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 26 Mar 2020 12:46:58 +1100 Subject: [PATCH] Fix crash setting the brush with the current brush was unset --- source/blender/editors/sculpt_paint/paint_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 59a0c50d402..0ed657ba460 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -716,7 +716,8 @@ static bool brush_generic_tool_set(bContext *C, brush = brush_tool_cycle(bmain, paint, brush_orig, tool); } - if (!brush && brush_tool(brush_orig, paint->runtime.tool_offset) != tool && create_missing) { + if (((brush == NULL) && create_missing) && + ((brush_orig == NULL) || brush_tool(brush_orig, paint->runtime.tool_offset) != tool)) { brush = BKE_brush_add(bmain, tool_name, paint->runtime.ob_mode); id_us_min(&brush->id); /* fake user only */ brush_tool_set(brush, paint->runtime.tool_offset, tool);