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_wave.h
View File

@@ -29,7 +29,7 @@ __device_noinline float svm_wave(NodeWaveType type, float3 p, float scale, float
if(type == NODE_WAVE_BANDS)
n = (p.x + p.y + p.z) * 10.0f;
else /* if(type == NODE_WAVE_RINGS) */
n = length(p) * 20.0f;
n = len(p) * 20.0f;
if(distortion != 0.0f)
n += distortion * noise_turbulence(p*dscale, NODE_NOISE_PERLIN, detail, 0);