Cycles / Math functions:

* Rename some math functions:
len -> length
len_squared -> length_squared
normalize_len -> normalize_length

* This way OpenCL uses its inbuilt length() function, rather than our own. The other two functions have been renamed for consistency. 
* Tested CPU, CUDA and OpenCL compile, should be no functional changes. 

1 files changed, 2 insertions, 2 deletions

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 1a2780995e3..cd266367b6f 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) * len(p1 - p2);
+						surface_area += M_PI_F *(r1 + r2) * length(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) * len(p1 - p2);
+					surface_area += M_PI_F *(r1 + r2) * length(p1 - p2);
 				}
 			}
 		}