Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-07-15 14:48:19 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-07-15 14:48:19 +0400
commit10253f73bcdfc9aee865e06e9000505e08e009dd (patch)
tree0d3391e6be698c5e04853547927ac4aa21b5bfa8 /source/blender/editors/space_image/image_draw.c
parent02bac0bebfcf7f56d5ff7f04a122ec8144424e3d (diff)
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.
Diffstat (limited to 'source/blender/editors/space_image/image_draw.c')
-rw-r--r--source/blender/editors/space_image/image_draw.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c
index 88eb280ea6b..cf78eaabd88 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -777,11 +777,11 @@ void draw_image_main(SpaceImage *sima, ARegion *ar, Scene *scene)
ED_space_image_release_buffer(sima, lock);
- /* render info */
- if (ima && show_render)
- draw_render_info(scene, ima, ar);
-
if (show_viewer) {
BLI_unlock_thread(LOCK_DRAW_IMAGE);
}
+
+ /* render info */
+ if (ima && show_render)
+ draw_render_info(scene, ima, ar);
}