griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Color management: fixed crash when freeing context for inactive viewer node

Browse Source
This commit is contained in:
Sergey Sharybin
2012-07-01 14:54:05 +00:00
parent 34a034fb1b
commit 148fdb3a7a
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
View File

@@ -47,10 +47,13 @@ ViewerBaseOperation::ViewerBaseOperation() : NodeOperation()
this->m_outputBufferDisplay = NULL;
this->m_active = false;
this->m_doColorManagement = true;
this->m_partialBufferUpdate = NULL;
}
void ViewerBaseOperation::initExecution()
{
this->m_partialBufferUpdate = NULL;
if (isActiveViewerOutput()) {
initImage();
}
@@ -90,11 +93,15 @@ void ViewerBaseOperation:: updateImage(rcti *rect)
void ViewerBaseOperation::deinitExecution()
{
ImBuf *ibuf = BKE_image_acquire_ibuf(this->m_image, this->m_imageUser, &this->m_lock);
if (this->m_partialBufferUpdate) {
/* partial buffer context could be NULL if it's not active viewer node */
IMB_partial_buffer_update_free(this->m_partialBufferUpdate, ibuf);
ImBuf *ibuf = BKE_image_acquire_ibuf(this->m_image, this->m_imageUser, &this->m_lock);
BKE_image_release_ibuf(this->m_image, this->m_lock);
IMB_partial_buffer_update_free(this->m_partialBufferUpdate, ibuf);
BKE_image_release_ibuf(this->m_image, this->m_lock);
}
this->m_outputBuffer = NULL;
}