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/light.cpp
View File

@@ -276,7 +276,7 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
p2 = transform_point(&tfm, p2);
}
totarea += M_PI_F * (r1 + r2) * length(p1 - p2);
totarea += M_PI_F * (r1 + r2) * len(p1 - p2);
}
}
@@ -547,7 +547,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce
else if(light->type == LIGHT_AREA) {
float3 axisu = light->axisu*(light->sizeu*light->size);
float3 axisv = light->axisv*(light->sizev*light->size);
float area = length(axisu)*length(axisv);
float area = len(axisu)*len(axisv);
float invarea = (area > 0.0f)? 1.0f/area: 1.0f;
if(light->use_mis && area > 0.0f)