sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix an unused function warning without openmp present, some typos

Browse Source
This commit is contained in:
Jens Verwiebe 2014-04-01 11:23:28 +02:00
parent 7955cb78d6
commit 62dc18c717
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenlib/intern/threads.c
View File

@ -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;

2
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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;