diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 10:37:29 +0400 |
commit | eadb192986bab5c7f831d292268c8627871d1acb (patch) | |
tree | 9891101df46a4d3640960a27894866d7927de1ac /source/blender/blenlib | |
parent | 92d35b74e79e63ae95732cf3161e84ace1e79e59 (diff) | |
parent | 1649521abe637b5af74174eda0d8ca0b5f1c6ceb (diff) |
svn merge -r41723:41751 ^/trunk/blender
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/intern/threads.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 299a85f8207..e92b445c27f 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -687,4 +687,4 @@ void BLI_end_threaded_malloc(void) thread_levels--; if(thread_levels==0) MEM_set_lock_callback(NULL, NULL); -}
\ No newline at end of file +} |