archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix missing NULL check when setting the tool

Browse Source
This commit is contained in:
Campbell Barton
2018-04-29 19:14:51 +02:00
parent 4218a94b1e
commit 0c512a6f95
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@@ -81,10 +81,12 @@ void WM_toolsystem_link(bContext *C, WorkSpace *workspace)
}
if (workspace->tool.data_block[0]) {
/* Currently only brush data-blocks supported. */
Paint *p = BKE_paint_get_active_from_context(C);
struct Brush *brush = (struct Brush *)BKE_libblock_find_name(ID_BR, workspace->tool.data_block);
if (brush) {
BKE_paint_brush_set(p, brush);
Paint *paint = BKE_paint_get_active_from_context(C);
if (paint) {
struct Brush *brush = (struct Brush *)BKE_libblock_find_name(ID_BR, workspace->tool.data_block);
if (brush) {
BKE_paint_brush_set(paint, brush);
}
}
}
}