Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles:

Browse Source 
* 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].
This commit is contained in:
Thomas Dinges
2013-06-04 17:20:00 +00:00
parent 4a7f37f6ed
commit 9e4914e055
22 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/svm/svm_texture.h
View File

@@ -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)