Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: remove lock from ViewerOperation class

Browse Source
This commit is contained in:
Campbell Barton
2013-08-06 09:27:20 +00:00
parent 4b99786b17
commit cf9dcb0709
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/compositor/operations/COM_ViewerOperation.cpp
View File

@@ -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)

1
source/blender/compositor/operations/COM_ViewerOperation.h
View File

@@ -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;