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/subd | |
| 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/subd')
| -rw-r--r-- | intern/cycles/subd/subd_dice.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/subd/subd_split.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp index 0174c139b01..48e6808bc38 100644 --- a/intern/cycles/subd/subd_dice.cpp +++ b/intern/cycles/subd/subd_dice.cpp @@ -98,8 +98,8 @@ void EdgeDice::stitch_triangles(vector<int>& outer, vector<int>& inner) } else { /* length of diagonals */ - float len1 = length(mesh_P[inner[i]] - mesh_P[outer[j+1]]); - float len2 = length(mesh_P[outer[j]] - mesh_P[inner[i+1]]); + float len1 = len(mesh_P[inner[i]] - mesh_P[outer[j+1]]); + float len2 = len(mesh_P[outer[j]] - mesh_P[inner[i+1]]); /* use smallest diagonal */ if(len1 < len2) diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/subd_split.cpp index cca64822647..074c82a2348 100644 --- a/intern/cycles/subd/subd_split.cpp +++ b/intern/cycles/subd/subd_split.cpp @@ -74,7 +74,7 @@ int DiagSplit::T(Patch *patch, float2 Pstart, float2 Pend) float3 P = project(patch, Pstart + t*(Pend - Pstart)); if(i > 0) { - float L = length(P - Plast); + float L = len(P - Plast); Lsum += L; Lmax = max(L, Lmax); } |