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_texture.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_texture.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_texture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_texture.h b/intern/cycles/kernel/svm/svm_texture.h index 67e08bad7f8..a4f6691435c 100644 --- a/intern/cycles/kernel/svm/svm_texture.h +++ b/intern/cycles/kernel/svm/svm_texture.h @@ -25,7 +25,7 @@ __device float voronoi_distance(NodeDistanceMetric distance_metric, float3 d, fl if(distance_metric == NODE_VORONOI_DISTANCE_SQUARED) return dot(d, d); if(distance_metric == NODE_VORONOI_ACTUAL_DISTANCE) - return length(d); + return len(d); if(distance_metric == NODE_VORONOI_MANHATTAN) return fabsf(d.x) + fabsf(d.y) + fabsf(d.z); if(distance_metric == NODE_VORONOI_CHEBYCHEV) |