diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
| commit | d09920687c4474f5f6ccf0f089d359f69932afac (patch) | |
| tree | 3fa95c573d162f2b228d1165b66f9bb6d41cf538 /source/blender/editors/space_image/image_draw.c | |
| parent | adc17317c5af23c0986a449da6d0aef130d1f503 (diff) | |
| parent | 128506eeb1a2d87393061b4c9783289a5e4b3275 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image/image_draw.c')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index e1ba83a0d78..fc4d8c39e26 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -378,11 +378,11 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d if (channels == 1) { if (fp) { rgb_to_hsv(fp[0], fp[0], fp[0], &hue, &sat, &val); - rgb_to_yuv(fp[0], fp[0], fp[0], &lum, &u, &v); + rgb_to_yuv(fp[0], fp[0], fp[0], &lum, &u, &v, BLI_YUV_ITU_BT709); } else if (cp) { rgb_to_hsv((float)cp[0] / 255.0f, (float)cp[0] / 255.0f, (float)cp[0] / 255.0f, &hue, &sat, &val); - rgb_to_yuv((float)cp[0] / 255.0f, (float)cp[0] / 255.0f, (float)cp[0] / 255.0f, &lum, &u, &v); + rgb_to_yuv((float)cp[0] / 255.0f, (float)cp[0] / 255.0f, (float)cp[0] / 255.0f, &lum, &u, &v, BLI_YUV_ITU_BT709); } BLI_snprintf(str, sizeof(str), "V:%-.4f", val); @@ -396,7 +396,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d } else if (channels >= 3) { rgb_to_hsv(finalcol[0], finalcol[1], finalcol[2], &hue, &sat, &val); - rgb_to_yuv(finalcol[0], finalcol[1], finalcol[2], &lum, &u, &v); + rgb_to_yuv(finalcol[0], finalcol[1], finalcol[2], &lum, &u, &v, BLI_YUV_ITU_BT709); BLI_snprintf(str, sizeof(str), "H:%-.4f", hue); BLF_position(blf_mono_font, dx, dy, 0); |