Commit: 1e479d1722df16fe62ed244ef248eb5f528bc908
Author: Sergey Sharybin
Date: Tue Nov 19 13:15:17 2013 +0600
http://developer.blender.org/rB1e479d1722df16fe62ed244ef248eb5f528bc908
Potential fix for T37525: Viewer node causes crash
LOCK_DRAW_IMAGE used to be unlocked twice. Now made it
so all the thread-unsafe code is inside a single lock/
unlock section.
===================================================================
M source/blender/compositor/operations/COM_ViewerOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp
b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 468aec6..97be44e 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
