Fix for a possible deadlock with render result drawing.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 27 Mar 2010 22:48:18 +0000 (22:48 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 27 Mar 2010 22:48:18 +0000 (22:48 +0000)
source/blender/editors/space_image/image_draw.c

index 6b2693eb627ad324bf1bc7ea8bb5fa7a1c02535e..2ba7de356d1949607ceb176025d224cd6d420c0a 100644 (file)
@@ -640,8 +640,8 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
 
        /* retrieve the image and information about it */
        ima= ED_space_image(sima);
-       ibuf= ED_space_image_acquire_buffer(sima, &lock);
        ED_space_image_zoom(sima, ar, &zoomx, &zoomy);
+       ibuf= ED_space_image_acquire_buffer(sima, &lock);
 
        show_viewer= (ima && ima->source == IMA_SRC_VIEWER);
        show_render= (show_viewer && ima->type == IMA_TYPE_R_RESULT);