[Bf-blender-cvs] [a0600de] master: Fix T41541: Cuda renders objects in black with MIS enabled in world setting

[Thomas Dinges]

Commit: a0600debda8cd9ec93cd8e10f5d7ecd5be9a1a9a
Author: Thomas Dinges
Date:   Fri Aug 22 20:09:40 2014 +0200
Branches: master
https://developer.blender.org/rBa0600debda8cd9ec93cd8e10f5d7ecd5be9a1a9a

Fix T41541: Cuda renders objects in black with MIS enabled in world setting

Issue introduced in 8d3cc431d7fdcc9f3243cc24dfdcb94124be0993, parameter mismatch.

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

M	intern/cycles/kernel/kernel.cu

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

diff --git a/intern/cycles/kernel/kernel.cu b/intern/cycles/kernel/kernel.cu
index 23f56ee..d5b5293 100644
--- a/intern/cycles/kernel/kernel.cu
+++ b/intern/cycles/kernel/kernel.cu
@@ -146,7 +146,7 @@ kernel_cuda_convert_to_half_float(uchar4 *rgba, float *buffer, float sample_scal
 
 extern "C" __global__ void
 CUDA_LAUNCH_BOUNDS(CUDA_THREADS_BLOCK_WIDTH, CUDA_KERNEL_MAX_REGISTERS)
-kernel_cuda_shader(uint4 *input, float4 *output, int type, int sx, int sw, int sample)
+kernel_cuda_shader(uint4 *input, float4 *output, int type, int sx, int sw, int offset, int sample)
 {
 	int x = sx + blockDim.x*blockIdx.x + threadIdx.x;