Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-06-04 21:20:00 +0400
committerThomas Dinges <blender@dingto.org>2013-06-04 21:20:00 +0400
commit9e4914e0553d0b7f57a3db86741307a17d79c21c (patch)
treeac5c2500d9f171deba253bd99c090726f3208576 /intern/cycles/render/object.cpp
parent4a7f37f6ed3569b12ff195081cca3f31430bef67 (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/render/object.cpp')
-rw-r--r--intern/cycles/render/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index cd266367b6f..1a2780995e3 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -200,7 +200,7 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
float r2 = mesh->curve_keys[first_key + i + 1].radius;
/* currently ignores segment overlaps*/
- surface_area += M_PI_F *(r1 + r2) * length(p1 - p2);
+ surface_area += M_PI_F *(r1 + r2) * len(p1 - p2);
}
}
@@ -233,7 +233,7 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
p2 = transform_point(&tfm, p2);
/* currently ignores segment overlaps*/
- surface_area += M_PI_F *(r1 + r2) * length(p1 - p2);
+ surface_area += M_PI_F *(r1 + r2) * len(p1 - p2);
}
}
}