[Bf-blender-cvs] [cb1cb63] master: Cycles: Fixes for few typos in OpenCL kernel

Sergey Sharybin noreply at git.blender.org
Fri Oct 30 19:31:55 CET 2015


Commit: cb1cb63d40cd5b2878f9def3a481017f72372380
Author: Sergey Sharybin
Date:   Fri Oct 30 23:30:48 2015 +0500
Branches: master
https://developer.blender.org/rBcb1cb63d40cd5b2878f9def3a481017f72372380

Cycles: Fixes for few typos in OpenCL kernel

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

M	intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
M	intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl

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

diff --git a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
index 83e0afd..d23e87e 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_direct_lighting.cl
@@ -61,7 +61,7 @@ __kernel void kernel_ocl_path_trace_direct_lighting(
 #ifndef __COMPUTE_DEVICE_GPU__
 	if(ray_index != QUEUE_EMPTY_SLOT) {
 #endif
-		enqueue_flag = kernel_direct_lighting((KernelGLobals *)kg,
+		enqueue_flag = kernel_direct_lighting((KernelGlobals *)kg,
 		                                      data,
 		                                      (ShaderData *)sd,
 		                                      (ShaderData *)sd_DL,
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
index fb327a3..2f099d8 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_lamp_emission.cl
@@ -68,7 +68,7 @@ __kernel void kernel_ocl_path_trace_lamp_emission(
 		}
 	}
 
-	kernel_lamp_emission((KenrelGLobals *)kg,
+	kernel_lamp_emission((KernelGlobals *)kg,
 	                     data,
 	                     (ShaderData *)sd,
 	                     throughput_coop,




More information about the Bf-blender-cvs mailing list