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/bvh | |
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/bvh')
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 82a444bda76..983d6fbce3e 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -287,7 +287,7 @@ void BVH::pack_curve_segment(int idx, float4 woop[3]) float3 v1 = mesh->curve_keys[k1].co; float3 d0 = v1 - v0; - float l = len(d0); + float l = length(d0); /*Plan *Transform tfm = make_transform( |