diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-27 20:38:53 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-27 20:39:03 +0400 |
| commit | f3798fa45e3b4936679948f9c9f51103dfe7a9d4 (patch) | |
| tree | 48d270af79684a5d6c6a2d08359c3e724786ea10 /source/blender/blenkernel/intern/scene.c | |
| parent | 4aea8f10855e9de162ca3ea0c232d2590ec386ba (diff) | |
Revert the testing sculpt openmp thread control and limit for OSX to physical threads as in 2.70a tag
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 608b0495454..a758735577e 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -638,9 +638,6 @@ Scene *BKE_scene_add(Main *bmain, const char *name) sce->gm.exitkey = 218; // Blender key code for ESC - sce->omp_threads_mode = SCE_OMP_AUTO; - sce->omp_threads = 1; - sound_create_scene(sce); /* color management */ @@ -1883,11 +1880,3 @@ int BKE_scene_num_threads(const Scene *scene) { return BKE_render_num_threads(&scene->r); } - -int BKE_scene_num_omp_threads(const struct Scene *scene) -{ - if (scene->omp_threads_mode == SCE_OMP_AUTO) - return BLI_system_thread_count_omp(); - else - return scene->omp_threads; -} |