[Bf-blender-cvs] [001fce167a] master: Fix: Button's label can be NULL

[raa]

Commit: 001fce167a01c6b028fc80ad480c8eeea1a526cd
Author: raa
Date:   Sun Mar 26 12:04:16 2017 +0300
Branches: master
https://developer.blender.org/rB001fce167a01c6b028fc80ad480c8eeea1a526cd

Fix: Button's label can be NULL

===================================================================

M       source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c 
b/source/blender/editors/interface/interface.c
index 57f3d228a1..9a717d30a8 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -3913,7 +3913,7 @@ uiBut *uiDefIconTextButO_ptr(uiBlock *block, int type, 
wmOperatorType *ot, int o
 uiBut *uiDefIconTextButO(uiBlock *block, int type, const char *opname, int 
opcontext, int icon, const char *str, int x, int y, short width, short height, 
const char *tip)
 {
        wmOperatorType *ot = WM_operatortype_find(opname, 0);
-       if (str[0] == '\0') 
+       if (str && str[0] == '\0') 
                return uiDefIconButO_ptr(block, type, ot, opcontext, icon, x, 
y, width, height, tip);
        return uiDefIconTextButO_ptr(block, type, ot, opcontext, icon, str, x, 
y, width, height, tip);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs