diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 15:03:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-09 15:03:53 +0400 |
| commit | c046b13b56d80ec3888b64e9215f1fc35b68b9b3 (patch) | |
| tree | bc109b01a0fd43a9ff4066fefa93438210ab6a5c /source/blender/editors/interface | |
| parent | 6d31921b2608ba743f290bf90aabd3e6fb110c50 (diff) | |
rename template_color_wheel() to template_color_picker()
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 3ee389fbd1f..84ae3a8f57d 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1956,7 +1956,7 @@ void uiTemplateCurveMapping(uiLayout *layout, PointerRNA *ptr, const char *propn #define WHEEL_SIZE 100 /* This template now follows User Preference for type - name is not correct anymore... */ -void uiTemplateColorWheel(uiLayout *layout, PointerRNA *ptr, const char *propname, int value_slider, int lock, int lock_luminosity, int cubic) +void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propname, int value_slider, int lock, int lock_luminosity, int cubic) { PropertyRNA *prop = RNA_struct_find_property(ptr, propname); uiBlock *block = uiLayoutGetBlock(layout); diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index feb1e95ad23..c836d62021e 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2114,7 +2114,7 @@ void ui_draw_gradient(rcti *rect, const float hsv[3], const int type, const floa sx1 = rect->xmin + dx * BLI_rcti_size_x(rect); sx2 = rect->xmin + (dx + color_step) * BLI_rcti_size_x(rect); sy = rect->ymin; - dy = (float)BLI_rcti_size_y(rect) / 3.0; + dy = (float)BLI_rcti_size_y(rect) / 3.0f; glBegin(GL_QUADS); for (a = 0; a < 3; a++, sy += dy) { |