diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 18:54:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 18:54:10 +0300 |
| commit | f62b826533422e5de3b08601e5511c233deda529 (patch) | |
| tree | c9d57326dfe030ba9c39060c0bdf1d3933e4c81b /source/blender/compositor | |
| parent | b0b2a478539500b112a0f4b002a9d3d2123be0d0 (diff) | |
| parent | 905eeb0bc7f46efb95cb5450cc6c2ec27f02730c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_PreviewOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index aa667884de6..2845b972f65 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -105,7 +105,7 @@ void PreviewOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/) color[3] = 1.0f; this->m_input->readSampled(color, rx, ry, COM_PS_NEAREST); IMB_colormanagement_processor_apply_v4(cm_processor, color); - F4TOCHAR4(color, this->m_outputBuffer + offset); + rgba_float_to_uchar(this->m_outputBuffer + offset, color); offset += 4; } } |