diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-28 17:45:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-28 17:45:19 +0400 |
| commit | 46895ab1f2786c2347d0d42b192197fca6d04bf5 (patch) | |
| tree | 65545e4cf6feff9d7f1b2059905086ef9d33b7d4 /source/blender/editors/render | |
| parent | 95d1d823133f59f71e29200de89d2d15c7f5af89 (diff) | |
Attempt to fix #21796: render crash on windows after slots commit.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index bdb93b0e9ae..dcafbc5b252 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -30,30 +30,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_editVert.h" -#include "BLI_dlrbTree.h" +#include "BLI_math.h" +#include "BLI_threads.h" #include "DNA_scene_types.h" #include "BKE_blender.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "BKE_sound.h" -#include "BKE_writeavi.h" #include "WM_api.h" #include "WM_types.h" @@ -68,7 +62,6 @@ #include "RNA_access.h" #include "RNA_define.h" - #include "wm_window.h" #include "render_intern.h" @@ -136,8 +129,12 @@ void image_buffer_rect_update(Scene *scene, RenderResult *rr, ImBuf *ibuf, volat } if(rectf==NULL) return; - if(ibuf->rect==NULL) - imb_addrectImBuf(ibuf); + if(ibuf->rect==NULL) { + BLI_lock_thread(LOCK_CUSTOM1); + if(ibuf->rect==NULL) + imb_addrectImBuf(ibuf); + BLI_unlock_thread(LOCK_CUSTOM1); + } rectf+= 4*(rr->rectx*ymin + xmin); rectc= (char *)(ibuf->rect + ibuf->x*rymin + rxmin); |