diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 06:09:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 06:12:51 +0300 |
| commit | 4f602ff943d91d0e6069e231916d2482ee859688 (patch) | |
| tree | 7efadce9699d7713447b368f9a18fff1b8b14c1c /source/blender/editors/interface/interface_regions.c | |
| parent | 255b07681acfe2ce8dd3af7d5b032d3c759cb93e (diff) | |
Revert part of recent color-management commit
This adds back rgb_to_grayscale,
not all color is managed or depends on the current loaded blend file's CM options.
Noted in comments that this is only to be used outside the CM pipeline.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index adcd615368b..ae62b61736a 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -237,8 +237,8 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) /* find the brightness difference between background and text colors */ - tone_bg = IMB_colormanagement_get_luminance(background_color); - /* tone_fg = IMB_colormanagement_get_luminance(main_color); */ + tone_bg = rgb_to_grayscale(background_color); + /* tone_fg = rgb_to_grayscale(main_color); */ /* mix the colors */ rgb_tint(value_color, 0.0f, 0.0f, tone_bg, 0.2f); /* light grey */ @@ -261,7 +261,7 @@ static void ui_tooltip_region_draw_cb(const bContext *UNUSED(C), ARegion *ar) /* override text-style */ fstyle_header.shadow = 1; - fstyle_header.shadowcolor = IMB_colormanagement_get_luminance(tip_colors[UI_TIP_LC_MAIN]); + fstyle_header.shadowcolor = rgb_to_grayscale(tip_colors[UI_TIP_LC_MAIN]); fstyle_header.shadx = fstyle_header.shady = 0; fstyle_header.shadowalpha = 1.0f; |