diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-06-08 02:13:28 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-06-08 02:39:02 +0400 |
| commit | f8f25c38d3352c7f480bbf1eba6415f76f62c76e (patch) | |
| tree | 2da7ccbfe052f88d8d3306aa766de6a17bce3a4b /source/blender/blenlib/BLI_threads.h | |
| parent | 918f6a49a7c0fcef29800460202cad40eeec99b5 (diff) | |
Fix T40510, revert openmp thread count to how it was in
2.70 for non Apple systems.
Also refactored the code that restores the previous openmp thread count.
The logic here was weird, mostly due to all the commit madness with
Apple openmp support. The restored thread count though should not depend
on the on/off state of threaded sculpting (since it has to do with
systems other than sculpting only). For OSX threads are restored to the
system thread count but Jens should recheck here.
Diffstat (limited to 'source/blender/blenlib/BLI_threads.h')
| -rw-r--r-- | source/blender/blenlib/BLI_threads.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index 1c9e75d950a..74291ca305e 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -74,8 +74,6 @@ void BLI_end_threaded_malloc(void); int BLI_system_thread_count(void); /* gets the number of threads the system can make use of */ void BLI_system_num_threads_override_set(int num); int BLI_system_num_threads_override_get(void); - -int BLI_system_thread_count_omp(void); /* Global Mutex Locks * |