From c5ed6765b9c46630579be5e43cab74965f0be9da Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 2 Jun 2013 20:39:32 +0000 Subject: Cycles / Math functions: * Rename some math functions: len -> length len_squared -> length_squared normalize_len -> normalize_length * This way OpenCL uses its inbuilt length() function, rather than our own. The other two functions have been renamed for consistency. * Tested CPU, CUDA and OpenCL compile, should be no functional changes. --- intern/cycles/kernel/kernel_emission.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/kernel/kernel_emission.h') diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 74f768c899c..42e5f3961cd 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -133,7 +133,7 @@ __device_noinline bool direct_emission(KernelGlobals *kg, ShaderData *sd, int li else { /* other lights, avoid self-intersection */ ray->D = ray_offset(ls.P, ls.Ng) - ray->P; - ray->D = normalize_len(ray->D, &ray->t); + ray->D = normalize_length(ray->D, &ray->t); } ray->dP = sd->dP; -- cgit v1.2.3