Merge branch 'blender2.7'

2 files changed, 3 insertions, 2 deletions

diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp
index 6260d8d13ab..2a705c2432b 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/util_task.cpp
@@ -223,10 +223,10 @@ int get_num_total_processors(const vector<int>& num_per_node_processors)
 	return num_total_processors;
 }
 
-/* Assign every thread a node on which is should be running, for the best
- * performance. */
+/* Compute NUMA node for every thread to run on, for the best performance. */
 vector<int> distribute_threads_on_nodes(const int num_threads)
 {
+	/* Start with all threads unassigned to any specific NUMA node. */
 	vector<int> thread_nodes(num_threads, -1);
 	const int num_active_group_processors =
 	        system_cpu_num_active_group_processors();
diff --git a/intern/numaapi/source/numaapi_win32.c b/intern/numaapi/source/numaapi_win32.c
index 8f1137a7bea..bd370707656 100644
--- a/intern/numaapi/source/numaapi_win32.c
+++ b/intern/numaapi/source/numaapi_win32.c
@@ -165,6 +165,7 @@ NUMAAPI_Result numaAPI_Initialize(void) {
 
 static int countNumSetBits(ULONGLONG mask) {
   // TODO(sergey): There might be faster way calculating number of set bits.
+  // NOTE: mask must be unsigned, there is undefined behavior for signed ints.
   int num_bits = 0;
   while (mask != 0) {
     num_bits += (mask & 1);