diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-03 00:39:32 +0400 |
| commit | c5ed6765b9c46630579be5e43cab74965f0be9da (patch) | |
| tree | 0ca3bee53bec86f5bb63a005aa4cbfb04e6735a6 /intern/cycles/kernel/kernel_camera.h | |
| parent | 834492489ab9cea37ff32166895b6a298d7225e9 (diff) | |
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.
Diffstat (limited to 'intern/cycles/kernel/kernel_camera.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index a23586a53a4..33456886990 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -255,7 +255,7 @@ __device_inline float camera_distance(KernelGlobals *kg, float3 P) return fabsf(dot((P - camP), camD)); } else - return len(P - camP); + return length(P - camP); } CCL_NAMESPACE_END |