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/svm/svm_math.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/svm/svm_math.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_math.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_math.h b/intern/cycles/kernel/svm/svm_math.h index 93d432e5954..dbf477a0a96 100644 --- a/intern/cycles/kernel/svm/svm_math.h +++ b/intern/cycles/kernel/svm/svm_math.h @@ -82,7 +82,7 @@ __device void svm_vector_math(float *Fac, float3 *Vector, NodeVectorMath type, f *Fac = average_fac(*Vector); } else if(type == NODE_VECTOR_MATH_AVERAGE) { - *Fac = length(Vector1 + Vector2); + *Fac = len(Vector1 + Vector2); *Vector = normalize(Vector1 + Vector2); } else if(type == NODE_VECTOR_MATH_DOT_PRODUCT) { @@ -91,11 +91,11 @@ __device void svm_vector_math(float *Fac, float3 *Vector, NodeVectorMath type, f } else if(type == NODE_VECTOR_MATH_CROSS_PRODUCT) { float3 c = cross(Vector1, Vector2); - *Fac = length(c); + *Fac = len(c); *Vector = normalize(c); } else if(type == NODE_VECTOR_MATH_NORMALIZE) { - *Fac = length(Vector1); + *Fac = len(Vector1); *Vector = normalize(Vector1); } else { |