diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-01 16:51:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-01 16:51:24 +0400 |
| commit | 9822e07be6c02f80955cbc36be3353d1c88b80b4 (patch) | |
| tree | 25ad4dd91c9408c2c158258cae956a41e1ba95cb /source/blender/editors/space_image/image_draw.c | |
| parent | 11e83768661638400bd3a0cd380adc00b67ddc36 (diff) | |
Attempted fixes for render crashes on windows, still can't redo them here
in a virtual machine, maybe that has some different threading behavior.
Also should fix a problem with displaying render passes and multiple slots.
Diffstat (limited to 'source/blender/editors/space_image/image_draw.c')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 55bec0740ea..a611ee6f32f 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -77,18 +77,14 @@ static void image_verify_buffer_float(SpaceImage *sima, Image *ima, ImBuf *ibuf, */ if(ibuf->rect_float && ibuf->rect==NULL) { - BLI_lock_thread(LOCK_CUSTOM1); - if(ibuf->rect_float && ibuf->rect==NULL) { - if(color_manage) { - if(ima && ima->source == IMA_SRC_VIEWER) - ibuf->profile = IB_PROFILE_LINEAR_RGB; - } - else - ibuf->profile = IB_PROFILE_NONE; - - IMB_rect_from_float(ibuf); + if(color_manage) { + if(ima && ima->source == IMA_SRC_VIEWER) + ibuf->profile = IB_PROFILE_LINEAR_RGB; } - BLI_unlock_thread(LOCK_CUSTOM1); + else + ibuf->profile = IB_PROFILE_NONE; + + IMB_rect_from_float(ibuf); } } |