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

Fix T57083: Grease Pencil / Texture Paint Crash in 2.8

Browse Source 
The brush of texture paint hadn't gp_icon
This commit is contained in:
Antonio Vazquez
2018-10-08 10:32:41 +02:00
parent 7d38654ecd
commit d12e781810
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@@ -65,7 +65,7 @@ def generate_from_brushes_ex(
for brush_type in brush_category_layout:
for brush in context.blend_data.brushes:
if getattr(brush, brush_test_attr) and brush.gpencil_settings.gp_icon == brush_type[0]:
if brush.gpencil_settings and getattr(brush, brush_test_attr) and brush.gpencil_settings.gp_icon == brush_type[0]:
category = brush_type[0]
name = brush.name
text = name

5
source/blender/editors/interface/interface_icons.c
View File

@@ -1672,7 +1672,10 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
}
/* reset the icon */
if (ob != NULL && ob->mode & OB_MODE_GPENCIL_PAINT) {
if ((ob != NULL) &&
(ob->mode & OB_MODE_GPENCIL_PAINT) &&
(br->gpencil_settings != NULL))
{
switch (br->gpencil_settings->icon_id) {
case GP_BRUSH_ICON_PENCIL:
br->id.icon_id = ICON_GPBRUSH_PENCIL;