Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T50958: template_ID_preview is crashing the blender's UI from branch 2.8

Browse Source 
So apparently ID pointer is allowed to be NULL here.
This commit is contained in:
Julian Eisel
2017-03-16 16:04:20 +01:00
parent e2df9ab386
commit 7eecc2e1c4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_templates.c
View File

@@ -429,7 +429,8 @@ static void template_ID(
but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, width, height, but = uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, width, height,
TIP_(template_id_browse_tip(type))); TIP_(template_id_browse_tip(type)));
if (use_preview_icon) { 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 { else {
ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON); ui_def_but_icon(but, RNA_struct_ui_icon(type), UI_HAS_ICON);