Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-17 15:07:46 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-17 15:07:46 +0400
commit0071ce502261dd68c621e62637b18c9297630952 (patch)
treef5de002527e927ae73c4f2c2d3ca6813532205af /source/blender/compositor
parent62cba2ca23fe75a251db8f834b81c1c24e8a57ad (diff)
Fix #33209: Opening an image with image node on Compositing freezes Blender
Own mistake in image threading commit.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_ImageOperation.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp
index a7743cd7668..d4c35f5afaa 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_ImageOperation.cpp
@@ -67,6 +67,7 @@ ImBuf *BaseImageOperation::getImBuf()
ibuf = BKE_image_acquire_ibuf(this->m_image, this->m_imageUser, NULL);
if (ibuf == NULL || (ibuf->rect == NULL && ibuf->rect_float == NULL)) {
+ BKE_image_release_ibuf(this->m_image, ibuf, NULL);
return NULL;
}
@@ -93,7 +94,7 @@ void BaseImageOperation::initExecution()
void BaseImageOperation::deinitExecution()
{
this->m_imageBuffer = NULL;
- IMB_freeImBuf(this->m_buffer);
+ BKE_image_release_ibuf(this->m_image, this->m_buffer, NULL);
}
void BaseImageOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])