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/compositor/operations/COM_CalculateMeanOperation.cpp | |
| parent | adc17317c5af23c0986a449da6d0aef130d1f503 (diff) | |
| parent | 128506eeb1a2d87393061b4c9783289a5e4b3275 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/operations/COM_CalculateMeanOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_CalculateMeanOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp index d26dcd17750..ecbc7a9a93d 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp @@ -121,7 +121,7 @@ void CalculateMeanOperation::calculateMean(MemoryBuffer *tile) case 5: { float yuv[3]; - rgb_to_yuv(buffer[offset], buffer[offset + 1], buffer[offset + 2], &yuv[0], &yuv[1], &yuv[2]); + rgb_to_yuv(buffer[offset], buffer[offset + 1], buffer[offset + 2], &yuv[0], &yuv[1], &yuv[2], BLI_YUV_ITU_BT709); sum += yuv[0]; break; } |