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

Correction to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used as alpha multiplier for icon

Browse Source
This commit is contained in:
Sergey Sharybin
2012-09-14 16:41:00 +00:00
parent c2b9150db2
commit b48398c96a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/interface/interface.c
View File

@@ -2595,7 +2595,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
/* we could do some more error checks here */ /* we could do some more error checks here */
if ((type & BUTTYPE) == LABEL) { if ((type & BUTTYPE) == LABEL) {
BLI_assert((poin != NULL || a1 != 0.0f || a2 != 0.0f || min != 0.0f || max != 0.0f) == FALSE); BLI_assert((poin != NULL || min != 0.0f || max != 0.0f || (a1 == 0.0f && a2 != 0.0f) || (a1 != 0.0f && a1 != 1.0f)) == FALSE);
} }
if (type & UI_BUT_POIN_TYPES) { /* a pointer is required */ if (type & UI_BUT_POIN_TYPES) { /* a pointer is required */