diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-11-23 20:17:12 +0400 |
| commit | 39dc956f593b3406bf1d81fb83c557b7b51f5327 (patch) | |
| tree | 50b59815aad48902a6563aefc8b944daf34c401e /source/blender/compositor/operations/COM_ViewerOperation.cpp | |
| parent | 5d5176095e82b34499e15d74f1fb76d56f4d9508 (diff) | |
| parent | d846c9a3b75c3d6f20bc7ab7d2da6cdd18bbbef2 (diff) | |
Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim
Conflicts:
intern/rigidbody/CMakeLists.txt
release/datafiles/splash.png
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_view3d_types.h
Diffstat (limited to 'source/blender/compositor/operations/COM_ViewerOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_ViewerOperation.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 468aec64a56..13b50910b50 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -101,18 +101,18 @@ void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber) for (y = y1; y < y2 && (!breaked); y++) { for (x = x1; x < x2; x++) { - this->m_imageInput->read(&(buffer[offset4]), x, y, COM_PS_NEAREST); + this->m_imageInput->readSampled(&(buffer[offset4]), x, y, COM_PS_NEAREST); if (this->m_ignoreAlpha) { buffer[offset4 + 3] = 1.0f; } else { if (this->m_alphaInput != NULL) { - this->m_alphaInput->read(alpha, x, y, COM_PS_NEAREST); + this->m_alphaInput->readSampled(alpha, x, y, COM_PS_NEAREST); buffer[offset4 + 3] = alpha[0]; } } if (m_depthInput) { - this->m_depthInput->read(depth, x, y, COM_PS_NEAREST); + this->m_depthInput->readSampled(depth, x, y, COM_PS_NEAREST); depthbuffer[offset] = depth[0]; } @@ -147,8 +147,6 @@ void ViewerOperation::initImage() ima->ok = IMA_OK_LOADED; ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID; - - BLI_unlock_thread(LOCK_DRAW_IMAGE); } if (m_doDepthBuffer) { |