From 7eecc2e1c43ba9ca6da62f2a0931ff3ce206236c Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Thu, 16 Mar 2017 16:04:20 +0100 Subject: [PATCH] Fix T50958: `template_ID_preview` is crashing the blender's UI from branch 2.8 So apparently ID pointer is allowed to be NULL here. --- source/blender/editors/interface/interface_templates.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f3636236820..2f64100fa66 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -429,7 +429,8 @@ static void template_ID( but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, width, height, TIP_(template_id_browse_tip(type))); if (use_preview_icon) { - ui_def_but_icon(but, ui_id_icon_get(C, id, use_big_size), UI_HAS_ICON | UI_BUT_ICON_PREVIEW); + int icon = id ? ui_id_icon_get(C, id, use_big_size) : RNA_struct_ui_icon(type); + ui_def_but_icon(but, icon, UI_HAS_ICON | UI_BUT_ICON_PREVIEW); } else { ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);