diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-04 21:20:00 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-04 21:20:00 +0400 |
| commit | 9e4914e0553d0b7f57a3db86741307a17d79c21c (patch) | |
| tree | ac5c2500d9f171deba253bd99c090726f3208576 /intern/cycles/kernel/kernel_camera.h | |
| parent | 4a7f37f6ed3569b12ff195081cca3f31430bef67 (diff) | |
Cycles:
* Revert r57203 (len() renaming)
There seems to be a problem with nVidia OpenCL after this and I haven't figured out the real cause yet.
Better to selectively enable native length() later, after figuring out what's wrong.
This fixes [#35612].
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 33456886990..a23586a53a4 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 length(P - camP); + return len(P - camP); } CCL_NAMESPACE_END |