blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix crash setting the brush with the current brush was unset

This commit is contained in:
Campbell Barton 2020-03-26 12:46:58 +11:00
parent ffd26b420c
commit a8e749f624
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/sculpt_paint/paint_ops.c
View File

@ -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);