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

4
intern/cycles/render/object.cpp
View File

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