[Bf-blender-cvs] [deef641] master: Anticipate future color picker types and don't crash (uiBut could be NULL in some cases)

[Antony Riakiotakis]

Commit: deef641878721438f39504aeef77c814500f37bb
Author: Antony Riakiotakis
Date:   Wed Mar 12 21:06:57 2014 +0200
https://developer.blender.org/rBdeef641878721438f39504aeef77c814500f37bb

Anticipate future color picker types and don't crash (uiBut could be
NULL in some cases)

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

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

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

diff --git a/source/blender/editors/interface/interface_regions.c 
b/source/blender/editors/interface/interface_regions.c
index f92d87b..0e966aa 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1910,6 +1910,9 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], 
PointerRNA *ptr, Proper
                case USER_CP_SQUARE_HV:
                        square_picker(block, ptr, prop, UI_GRAD_HV);
                        break;
+               default:
+                       circle_picker(block, ptr, prop);
+                       break;
        }
        
        /* mode */
diff --git a/source/blender/editors/interface/interface_templates.c 
b/source/blender/editors/interface/interface_templates.c
index d4d2bc4..a7be32a 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2257,6 +2257,11 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA 
*ptr, const char *propna
                        but = uiDefButR_prop(block, HSVCUBE, 0, "", 0, 0, 
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
                                             -1, 0.0, 0.0, UI_GRAD_HV, 0, "");
                        break;
+               default:
+                       but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, 
WHEEL_SIZE, WHEEL_SIZE, ptr, prop,
+                                                                -1, 0.0, 0.0, 
0, 0, "");
+                       break;
+
        }
 
        if (lock) {
@@ -2301,6 +2306,11 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA 
*ptr, const char *propna
                                uiDefButR_prop(block, HSVCUBE, 0, "", 0, 4, 
WHEEL_SIZE, 18, ptr, prop,
                                               -1, softmin, softmax, UI_GRAD_HV 
+ 3, 0, "");
                                break;
+                       default:
+                               uiItemS(row);
+                               uiDefButR_prop(block, HSVCUBE, 0, "", 
WHEEL_SIZE + 6, 0, 14, WHEEL_SIZE, ptr, prop,
+                                                          -1, softmin, 
softmax, UI_GRAD_V_ALT, 0, "");
+                               break;
                }
        }
 }

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