[Bf-blender-cvs] [b277ba5] master: Cycles: Fix compilation error on OSX

Sergey Sharybin noreply at git.blender.org
Mon Jun 6 13:52:55 CEST 2016


Commit: b277ba5c0d75f241e17bfbd7492dd2f5e3f146b9
Author: Sergey Sharybin
Date:   Mon Jun 6 13:52:57 2016 +0200
Branches: master
https://developer.blender.org/rBb277ba5c0d75f241e17bfbd7492dd2f5e3f146b9

Cycles: Fix compilation error on OSX

===================================================================

M	intern/cycles/util/util_system.cpp

===================================================================

diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 16f713e..d5fac9a 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -54,10 +54,9 @@ int system_cpu_group_thread_count(int group)
 	return GetActiveProcessorCount(group);
 #elif defined(__APPLE__)
 	(void)group;
+	int count;
 	size_t len = sizeof(count);
 	int mib[2] = { CTL_HW, HW_NCPU };
-
-	int count;
 	sysctl(mib, 2, &count, &len, NULL, 0);
 	return count;
 #else




More information about the Bf-blender-cvs mailing list