diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 13:27:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-06 13:27:20 +0400 |
commit | cf9dcb070931341612369700bc35262d87361c37 (patch) | |
tree | 3c0dce649df74799d3cf4b2cfbf1415960a7c532 | |
parent | 4b99786b17aab8b94d29999ffb279363650b17b3 (diff) |
code cleanup: remove lock from ViewerOperation class
-rw-r--r-- | source/blender/compositor/operations/COM_ViewerOperation.cpp | 9 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_ViewerOperation.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index fbf73c27e09..e9f083178e4 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -130,8 +130,9 @@ void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber) void ViewerOperation::initImage() { - Image *anImage = this->m_image; - ImBuf *ibuf = BKE_image_acquire_ibuf(anImage, this->m_imageUser, &this->m_lock); + Image *ima = this->m_image; + void *lock; + ImBuf *ibuf = BKE_image_acquire_ibuf(ima, this->m_imageUser, &lock); if (!ibuf) return; BLI_lock_thread(LOCK_DRAW_IMAGE); @@ -143,7 +144,7 @@ void ViewerOperation::initImage() ibuf->x = getWidth(); ibuf->y = getHeight(); imb_addrectfloatImBuf(ibuf); - anImage->ok = IMA_OK_LOADED; + ima->ok = IMA_OK_LOADED; ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID; @@ -165,7 +166,7 @@ void ViewerOperation::initImage() this->m_depthBuffer = ibuf->zbuf_float; } - BKE_image_release_ibuf(this->m_image, this->m_ibuf, this->m_lock); + BKE_image_release_ibuf(this->m_image, this->m_ibuf, lock); } void ViewerOperation::updateImage(rcti *rect) diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 2d8fe659822..0b8d08d3974 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -33,7 +33,6 @@ private: float *m_depthBuffer; Image *m_image; ImageUser *m_imageUser; - void *m_lock; bool m_active; float m_centerX; float m_centerY; |