diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-13 17:59:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-13 21:25:45 +0300 |
| commit | 6601a89650f92454aa57bc01bedebd4086f6d98d (patch) | |
| tree | e25523b1b8598f64947a727266bd13f7223ca299 /source/blender/editors/interface/interface_intern.h | |
| parent | 33993c056a557d8c51ff9d01ff3666ab81d40c29 (diff) | |
Fix T58549, T56741: HSV color picker issues with Filmic view transform.
In 2d655d3 the color picker was changed to use display space HSV values.
This works ok for a simple sRGB EOTF, but fails with view transforms like
Filmic where display space V 1.0 maps to RGB 16.292.
Instead we now use the color_picking role from the OCIO config when
converting from RGB to HSV in the color picker. This role is set to sRGB
in the default OCIO config.
This color space fits the following requirements:
* It is approximately perceptually linear, so that the HSV numbers and
the HSV cube/circle have an intuitive distribution.
* It has the same gamut as the scene linear color space.
* Color picking values 0..1 map to scene linear values in the 0..1 range,
so that picked albedo values are energy conserving.
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 7e8653bfc56..0ab92a633ad 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -439,7 +439,7 @@ struct uiBlock { struct UnitSettings *unit; /* unit system, used a lot for numeric buttons so include here rather then fetching through the scene every time. */ ColorPickerData color_pickers; /* XXX, only accessed by color picker templates */ - bool color_profile; /* color profile for correcting linear colors for display */ + bool is_color_gamma_picker; /* Block for color picker with gamma baked in. */ char display_device[64]; /* display device name used to display this block, * used by color widgets to transform colors from/to scene linear @@ -477,7 +477,6 @@ extern void ui_hsvcircle_vals_from_pos( const float mx, const float my); extern void ui_hsvcircle_pos_from_vals(struct uiBut *but, const rcti *rect, float *hsv, float *xpos, float *ypos); extern void ui_hsvcube_pos_from_vals(struct uiBut *but, const rcti *rect, float *hsv, float *xp, float *yp); -bool ui_but_is_colorpicker_display_space(struct uiBut *but); extern void ui_but_string_get_ex( uiBut *but, char *str, const size_t maxlen, @@ -516,7 +515,6 @@ extern void ui_block_bounds_calc(uiBlock *block); extern struct ColorManagedDisplay *ui_block_cm_display_get(uiBlock *block); void ui_block_cm_to_display_space_v3(uiBlock *block, float pixel[3]); void ui_block_cm_to_scene_linear_v3(uiBlock *block, float pixel[3]); -void ui_block_cm_to_display_space_range(uiBlock *block, float *min, float *max); /* interface_regions.c */ @@ -611,6 +609,11 @@ 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); +bool ui_but_is_color_gamma(uiBut *but); + +void ui_scene_linear_to_color_picker_space(uiBut *but, float rgb[3]); +void ui_color_picker_to_scene_linear_space(uiBut *but, float rgb[3]); + uiBlock *ui_block_func_COLOR(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but); ColorPicker *ui_block_colorpicker_create(struct uiBlock *block); |