diff options
author | Peter Schlaile <peter@schlaile.de> | 2007-11-25 19:35:33 +0300 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2007-11-25 19:35:33 +0300 |
commit | 4018dfd28f3bfdeba2e10a36401b573a75152cc5 (patch) | |
tree | 1e08ae46c8523d77af85d9ce4eb7a9ae0b9c4b76 /source/blender/src/sequence.c | |
parent | a32287ebfbb36b1a3e1bb02563cb096179041f28 (diff) |
== Sequencer ==
Added malloc mutex handling. (Sorry, had to patch threads.c a bit,
since otherwise scene tracks will completely screw things up...)
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index 1e0026cde93..73eb0a96764 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -71,6 +71,7 @@ #include "blendef.h" +#include "BLI_threads.h" #include <pthread.h> int seqrectx, seqrecty; @@ -1269,7 +1270,6 @@ typedef struct PrefetchQueueElem { struct ImBuf * ibuf; } PrefetchQueueElem; - static void * seq_prefetch_thread(void * This_) { PrefetchThread * This = This_; @@ -1370,6 +1370,9 @@ void seq_start_threads() pthread_create(&t->pthread, NULL, seq_prefetch_thread, t); } + + /* init malloc mutex */ + BLI_init_threads(0, 0, 0); } void seq_stop_threads() @@ -1410,6 +1413,9 @@ void seq_stop_threads() } BLI_freelistN(&running_threads); + + /* deinit malloc mutex */ + BLI_end_threads(0); } void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown) |