diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 19:58:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-16 19:58:45 +0300 |
| commit | f17dcf58c86274661a10cf4f95939deb63a02fa7 (patch) | |
| tree | 94fc52b7e0d41d6cb806eaf5e0b0e604c20722c1 /source/blender/blenlib/BLI_threads.h | |
| parent | 735b444d74d41bf2cec1ab81e781283e79d9c3d6 (diff) | |
Fixes for thread related render / compositing crashes:
* Viewer node could free image while it is being redrawn, viewer image
buffers now need acquire/release to be accessed as was already the
case for render results.
* The Composite node could free the image buffers outside of a lock,
also causing simultaneous redraw to crash.
* Especially on Windows, re-rendering could crash when drawing an image
that was freed. When RE_RenderInProgress was true it would access the
image buffer and simply return it while it could still contain a pointer
to a render result buffer that was already freed. I don't understand
why this case was there in the first place, so I've removed it.
Possibly fixes bugs #20174, #21418, #21391, #21394.
Diffstat (limited to 'source/blender/blenlib/BLI_threads.h')
| -rw-r--r-- | source/blender/blenlib/BLI_threads.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 25ecea919e7..08e24d677f5 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -59,7 +59,8 @@ int BLI_system_thread_count(void); /* gets the number of threads the system can #define LOCK_IMAGE 0 #define LOCK_PREVIEW 1 -#define LOCK_CUSTOM1 2 +#define LOCK_VIEWER 2 +#define LOCK_CUSTOM1 3 void BLI_lock_thread(int type); void BLI_unlock_thread(int type); |