[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27796] trunk/blender/source/blender/ editors/space_image/image_draw.c: Fix for a possible deadlock with render result drawing.

[Brecht Van Lommel]

Revision: 27796
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27796
Author:   blendix
Date:     2010-03-27 23:48:18 +0100 (Sat, 27 Mar 2010)

Log Message:
-----------
Fix for a possible deadlock with render result drawing.

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       
2010-03-27 22:23:23 UTC (rev 27795)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c       
2010-03-27 22:48:18 UTC (rev 27796)
@@ -640,8 +640,8 @@
 
        /* retrieve the image and information about it */
        ima= ED_space_image(sima);
+       ED_space_image_zoom(sima, ar, &zoomx, &zoomy);
        ibuf= ED_space_image_acquire_buffer(sima, &lock);
-       ED_space_image_zoom(sima, ar, &zoomx, &zoomy);
 
        show_viewer= (ima && ima->source == IMA_SRC_VIEWER);
        show_render= (show_viewer && ima->type == IMA_TYPE_R_RESULT);


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