[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48937] trunk/blender/source/blender/ editors/space_image/image_draw.c: Fixed deadlock caused by thread locks added in 48893

[Sergey Sharybin]

Revision: 48937
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48937
Author:   nazgul
Date:     2012-07-15 10:48:19 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
Fixed deadlock caused by thread locks added in 48893

This deadlock was caused by lock of threads using LOCK_DRAW_IMAGE
mutex and lock used in render result acquire functions.

So if image draw would lock LOCK_DRAW_IMAGE before compositor
operation released render result it'll lead into a deadlock.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_draw.c

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c       
2012-07-15 10:43:50 UTC (rev 48936)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c       
2012-07-15 10:48:19 UTC (rev 48937)
@@ -777,11 +777,11 @@
 
        ED_space_image_release_buffer(sima, lock);
 
+       if (show_viewer) {
+               BLI_unlock_thread(LOCK_DRAW_IMAGE);
+       }
+
        /* render info */
        if (ima && show_render)
                draw_render_info(scene, ima, ar);
-
-       if (show_viewer) {
-               BLI_unlock_thread(LOCK_DRAW_IMAGE);
-       }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs