diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-28 01:48:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-28 01:48:18 +0300 |
| commit | ddbb2bdaa57b69839e835c68c32086883a377560 (patch) | |
| tree | f022fb22ee9efb12207db0d4c29d68f77b8b0725 /source/blender/editors/space_image/image_draw.c | |
| parent | 34cc878153b7275fdf1a13a81741a36da61d79b5 (diff) | |
Fix for a possible deadlock with render result drawing.
Diffstat (limited to 'source/blender/editors/space_image/image_draw.c')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 6b2693eb627..2ba7de356d1 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -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); |