Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-03-30 19:38:33 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-03-30 19:38:52 +0400
commitd84bd56ec5c8f480849992b14d65797d8a94c97e (patch)
tree27b899d2435b501e15e313bd0f740fe35d583717 /source/blender
parentb99977ac60f8622100f58d19611d344ffd6d2ddd (diff)
OSX: Remove the apple/omp workaround for now, to better judge compiler differences
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d138e9808a2..f4d16b864fb 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -104,20 +104,6 @@
#include <omp.h>
#endif
-#if defined(__APPLE__)
-#include <sys/sysctl.h>
-
-/* how many cores not counting HT aka pysical cores */
-int system_physical_thread_count(void); // declaration here for simplification
-int system_physical_thread_count(void)
-{
- int pcount;
- size_t pcount_len = sizeof(pcount);
- sysctlbyname("hw.physicalcpu", &pcount, &pcount_len, NULL, 0);
- return pcount;
-}
-#endif // __APPLE__
-
void ED_sculpt_get_average_stroke(Object *ob, float stroke[3])
{
if (ob->sculpt->last_stroke_valid && ob->sculpt->average_stroke_counter > 0) {
@@ -3793,16 +3779,11 @@ static void sculpt_omp_start(Sculpt *sd, SculptSession *ss)
* Justification: Empirically I've found that two threads per
* processor gives higher throughput. */
if (sd->flags & SCULPT_USE_OPENMP) {
-#if defined(__APPLE__)
- cache->num_threads = system_physical_thread_count();
-#else
cache->num_threads = omp_get_num_procs();
-#endif
}
else {
cache->num_threads = 1;
}
- omp_set_num_threads(cache->num_threads);
#else
(void)sd;
cache->num_threads = 1;