Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2014-03-14 03:37:32 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-03-14 03:42:50 +0400
commit33f51abe4ef82cd8d38fae7408eb6e50d77e4fbc (patch)
tree1b2012da99fff6d9ece67dfc08e9d0e763763148 /source
parent8c726690628a56b4da868d01deae57dda0fd0827 (diff)
Better fix for T37545.
This was supposed to fix inaccuracies between S-H wheel but it makes the colors selected through the SV-H color cube wrong (see http:// %28SV-H%29-Inaccurate). Instead of deactivating color management for SV and H widgets just reenable correction for the Hue wheel. This is wrong because HSV always refers to display space and we -have- to account for that when using linear color RNA properties.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_widgets.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index d3901371765..e2f3aaca39c 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2270,8 +2270,7 @@ bool ui_hsvcube_use_display_colorspace(uiBut *but)
color_profile = false;
}
- /* SV+H gradient does not use display colorspace */
- return color_profile && !ELEM((int)but->a1, UI_GRAD_SV, UI_GRAD_H);
+ return color_profile;
}
void ui_hsvcube_pos_from_vals(uiBut *but, const rcti *rect, float *hsv, float *xp, float *yp)