Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T57963: Cycles crash using AO for displacement.

Browse Source 
Note this is not supported, there exists no geometry at this point, but
it should not crash at least.
This commit is contained in:
Brecht Van Lommel
2018-12-06 19:50:05 +01:00
parent d24cfa329b
commit cccc40db51
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/svm/svm_ao.h
View File

@@ -33,6 +33,11 @@ ccl_device_noinline float svm_ao(KernelGlobals *kg,
return 1.0f; return 1.0f;
} }
/* Can't raytrace from shaders like displacement, before BVH exists. */
if (kernel_data.bvh.bvh_layout == BVH_LAYOUT_NONE) {
return 1.0f;
}
if(flags & NODE_AO_INSIDE) { if(flags & NODE_AO_INSIDE) {
N = -N; N = -N;
} }

5
intern/cycles/kernel/svm/svm_bevel.h
View File

@@ -34,6 +34,11 @@ ccl_device_noinline float3 svm_bevel(
return sd->N; return sd->N;
} }
/* Can't raytrace from shaders like displacement, before BVH exists. */
if (kernel_data.bvh.bvh_layout == BVH_LAYOUT_NONE) {
return sd->N;
}
/* Don't bevel for blurry indirect rays. */ /* Don't bevel for blurry indirect rays. */
if(state->min_ray_pdf < 8.0f) { if(state->min_ray_pdf < 8.0f) {
return sd->N; return sd->N;