diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:25:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:25:45 +0400 |
| commit | 92d35b74e79e63ae95732cf3161e84ace1e79e59 (patch) | |
| tree | 19a8ecf74bfcae5187a4e25520f4e55384e7707b /source/blender/blenlib/intern/threads.c | |
| parent | 67386c003d5d4bd5355323acdfbef1aa9fa2b71d (diff) | |
| parent | afeb0eeaf0e8caf5e46a5dd6fbea3786e9fb1354 (diff) | |
svn merge -r41722:41723 ^/trunk/blender
Diffstat (limited to 'source/blender/blenlib/intern/threads.c')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 22c71189d90..299a85f8207 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -674,3 +674,17 @@ void BLI_thread_queue_nowait(ThreadQueue *queue) pthread_mutex_unlock(&queue->mutex); } +void BLI_begin_threaded_malloc(void) +{ + if(thread_levels == 0) { + MEM_set_lock_callback(BLI_lock_malloc_thread, BLI_unlock_malloc_thread); + } + thread_levels++; +} + +void BLI_end_threaded_malloc(void) +{ + thread_levels--; + if(thread_levels==0) + MEM_set_lock_callback(NULL, NULL); +}
\ No newline at end of file |