diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-14 20:41:00 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-14 20:41:00 +0400 |
| commit | b48398c96aa91fec0f5a5f34c36b9d2dae61718f (patch) | |
| tree | 3dc971e2941eef619916436ee1ab94887e29dafa /source | |
| parent | c2b9150db2d487e81a175f7c4c9a59f7712fd4b7 (diff) | |
Correction to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used as alpha multiplier for icon
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index aef20245676..823f8d7be39 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -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 */ 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 */ |