archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Slight modification to previous color wheel tweak.

Browse Source 
Do not use compat version, we do not have a valid previous value really
to use here.
This commit is contained in:
Antonis Ryakiotakis
2014-04-12 19:27:16 +03:00
parent f7d06cdb6b
commit a2b3c93852
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/interface/interface_intern.h
View File

@@ -479,6 +479,7 @@ float *ui_block_hsv_get(struct uiBlock *block);
void ui_popup_block_scrolltest(struct uiBlock *block);
void ui_rgb_to_color_picker_compat_v(const float rgb[3], float r_cp[3]);
void ui_rgb_to_color_picker_v(const float rgb[3], float r_cp[3]);
void ui_color_picker_to_rgb_v(const float r_cp[3], float rgb[3]);
void ui_color_picker_to_rgb(float r_cp0, float r_cp1, float r_cp2, float *r, float *g, float *b);

14
source/blender/editors/interface/interface_regions.c
View File

@@ -1994,7 +1994,7 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper
uiButSetFunc(bt, do_hex_rna_cb, bt, hexcol);
uiDefBut(block, LABEL, 0, IFACE_("(Gamma Corrected)"), 0, yco - UI_UNIT_Y, butwidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
ui_rgb_to_color_picker_compat_v(rgb_gamma, hsv);
ui_rgb_to_color_picker_v(rgb_gamma, hsv);
picker_new_hide_reveal(block, colormode);
}
@@ -2556,6 +2556,18 @@ void ui_rgb_to_color_picker_compat_v(const float rgb[3], float r_cp[3])
}
}
void ui_rgb_to_color_picker_v(const float rgb[3], float r_cp[3])
{
switch (U.color_picker_type) {
case USER_CP_CIRCLE_HSL:
rgb_to_hsl_v(rgb, r_cp);
break;
default:
rgb_to_hsv_v(rgb, r_cp);
break;
}
}
void ui_color_picker_to_rgb_v(const float r_cp[3], float rgb[3])
{
switch (U.color_picker_type) {