kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T69686: Cycles OpenCL build error after recent changes

Browse Source
This commit is contained in:
Brecht Van Lommel 2019-09-09 21:03:37 +02:00
parent 0426866eb0
commit 51334dd3a6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/closure/bsdf.h
View File

@ -447,7 +447,7 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
}
}
else if (label & LABEL_DIFFUSE) {
if (sc->N != sd->N) {
if (!isequal_float3(sc->N, sd->N)) {
*eval *= bump_shadowing_term((label & LABEL_TRANSMIT) ? -sd->N : sd->N, sc->N, *omega_in);
}
}
@ -563,9 +563,11 @@ ccl_device_inline
break;
}
if (CLOSURE_IS_BSDF_DIFFUSE(sc->type)) {
if (!isequal_float3(sc->N, sd->N)) {
eval *= bump_shadowing_term(sd->N, sc->N, omega_in);
}
}
}
else {
switch (sc->type) {
case CLOSURE_BSDF_DIFFUSE_ID:
@ -652,9 +654,11 @@ ccl_device_inline
break;
}
if (CLOSURE_IS_BSDF_DIFFUSE(sc->type)) {
if (!isequal_float3(sc->N, sd->N)) {
eval *= bump_shadowing_term(-sd->N, sc->N, omega_in);
}
}
}
return eval;
}