[Bf-blender-cvs] [4d82d525f8] master: Cycles: Fix building for some compilers

Mai Lavelle noreply at git.blender.org
Thu Mar 23 05:15:03 CET 2017


Commit: 4d82d525f85af937bb59c08d584413e5419037ce
Author: Mai Lavelle
Date:   Thu Mar 23 00:11:29 2017 -0400
Branches: master
https://developer.blender.org/rB4d82d525f85af937bb59c08d584413e5419037ce

Cycles: Fix building for some compilers

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

M	intern/cycles/device/device_cuda.cpp

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

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 58471ba67c..08dfa18138 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1500,7 +1500,7 @@ uint64_t CUDASplitKernel::state_buffer_size(device_memory& /*kg*/, device_memory
 	cuda_assert(cuLaunchKernel(state_buffer_size,
 	                           1, 1, 1,
 	                           1, 1, 1,
-	                           0, 0, &args, 0));
+	                           0, 0, (void**)&args, 0));
 
 	device->cuda_pop_context();




More information about the Bf-blender-cvs mailing list