diff options
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 61d14bf3bb7..e01e6bdd49e 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2084,19 +2084,19 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna PropertyRNA *prop = RNA_struct_find_property(ptr, propname); uiBlock *block = uiLayoutGetBlock(layout); uiLayout *col, *row; - uiBut *but; + uiBut *but = NULL; float softmin, softmax, step, precision; - + if (!prop) { RNA_warning("property not found: %s.%s", RNA_struct_identifier(ptr->type), propname); return; } RNA_property_float_ui_range(ptr, prop, &softmin, &softmax, &step, &precision); - + col = uiLayoutColumn(layout, TRUE); row = uiLayoutRow(col, TRUE); - + switch (U.color_picker_type) { case USER_CP_CIRCLE: but = uiDefButR_prop(block, HSVCIRCLE, 0, "", 0, 0, WHEEL_SIZE, WHEEL_SIZE, ptr, prop, @@ -2115,7 +2115,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna -1, 0.0, 0.0, UI_GRAD_HV, 0, ""); break; } - if (lock) { but->flag |= UI_BUT_COLOR_LOCK; @@ -2133,7 +2132,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna if (value_slider) { - switch (U.color_picker_type) { case USER_CP_CIRCLE: uiItemS(row); @@ -2156,7 +2154,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna -1, softmin, softmax, UI_GRAD_HV + 3, 0, ""); break; } - } } |