[Bf-blender-cvs] [13ac92d057e] blender2.8: Fix T55507: Crash due to GPencil brush icon management, when there is no active object.
Bastien Montagne
noreply at git.blender.org
Thu Aug 23 21:57:14 CEST 2018
Commit: 13ac92d057e5c916d170d000554ec000a3c30358
Author: Bastien Montagne
Date: Thu Aug 23 21:56:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB13ac92d057e5c916d170d000554ec000a3c30358
Fix T55507: Crash due to GPencil brush icon management, when there is no active object.
===================================================================
M source/blender/editors/interface/interface_icons.c
===================================================================
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 4f77b797ec0..8816d6acec8 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1636,7 +1636,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
}
/* reset the icon */
- if (ob->mode & OB_MODE_GPENCIL_PAINT) {
+ if (ob != NULL && ob->mode & OB_MODE_GPENCIL_PAINT) {
switch (br->gpencil_settings->icon_id) {
case GP_BRUSH_ICON_PENCIL:
br->id.icon_id = ICON_GPBRUSH_PENCIL;
More information about the Bf-blender-cvs
mailing list