diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-01 13:23:28 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-04-01 13:23:28 +0400 |
| commit | 62dc18c717ea8c47c87e825b94a568486f93c452 (patch) | |
| tree | d43d4ff6b0ba4469377b5afef6e9cdde91b62ca2 /source | |
| parent | 7955cb78d6ec403ee7a3c99f5228532cc44690e4 (diff) | |
Fix an unused function warning without openmp present, some typos
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 78752fde608..95986b11292 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -58,12 +58,12 @@ #include <omp.h> #endif -#if defined(__APPLE__) -#if defined(_OPENMP) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && !defined(__clang__) +#if defined(__APPLE__) && defined(_OPENMP) +#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) && !defined(__clang__) # define USE_APPLE_OMP_FIX #endif -/* how many cores not counting HT aka pysical cores */ +/* how many cores not counting HT aka physical cores */ static int system_physical_thread_count(void) { int ptcount; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 15a1cfdbdd3..50df1821fa2 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3785,7 +3785,7 @@ static void sculpt_omp_start(Scene *scene, Sculpt *sd, SculptSession *ss) else { cache->num_threads = 1; } - omp_set_num_threads(cache->num_threads); /* set user-defined corecount wich is physical cores when "AUTO" ( atm. OSX-only )*/ + omp_set_num_threads(cache->num_threads); /* set user-defined corecount, "AUTO" = physical cores on OSX, logical cores for other OS atm.*/ #else (void)scene; (void)sd; |