[Bf-blender-cvs] [439a277aa5] master: Cycles: Silence strict compiler warning

Sergey Sharybin noreply at git.blender.org
Fri Mar 17 09:59:52 CET 2017


Commit: 439a277aa5a206c18ef8379f791d1affd6a0d709
Author: Sergey Sharybin
Date:   Fri Mar 17 09:56:44 2017 +0100
Branches: master
https://developer.blender.org/rB439a277aa5a206c18ef8379f791d1affd6a0d709

Cycles: Silence strict compiler warning

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

M	intern/cycles/device/device_cpu.cpp

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

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 2fc2745a3a..d1027f0751 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -855,7 +855,7 @@ int2 CPUSplitKernel::split_kernel_local_size()
 	return make_int2(1, 1);
 }
 
-int2 CPUSplitKernel::split_kernel_global_size(device_memory& /*kg*/, device_memory& /*data*/, DeviceTask *task) {
+int2 CPUSplitKernel::split_kernel_global_size(device_memory& /*kg*/, device_memory& /*data*/, DeviceTask * /*task*/) {
 	return make_int2(64, 1);
 }




More information about the Bf-blender-cvs mailing list