[Bf-blender-cvs] [62dc18c] master: Fix an unused function warning without openmp present, some typos
Jens Verwiebe
noreply at git.blender.org
Tue Apr 1 11:23:46 CEST 2014
Commit: 62dc18c717ea8c47c87e825b94a568486f93c452
Author: Jens Verwiebe
Date: Tue Apr 1 11:23:28 2014 +0200
https://developer.blender.org/rB62dc18c717ea8c47c87e825b94a568486f93c452
Fix an unused function warning without openmp present, some typos
===================================================================
M source/blender/blenlib/intern/threads.c
M source/blender/editors/sculpt_paint/sculpt.c
===================================================================
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 78752fd..95986b1 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 15a1cfd..50df182 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;
More information about the Bf-blender-cvs
mailing list