Correction to rev50582: LABEL could have a1 = 1.0f and in this case a2 would be used...
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Sep 2012 16:41:00 +0000 (16:41 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Sep 2012 16:41:00 +0000 (16:41 +0000)
source/blender/editors/interface/interface.c

index aef202456761e469b2062697e23daf387d0b11b7..823f8d7be39ffcf197d9051646c8950c50ac4a8a 100644 (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 */
        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 */