Commit: dc5367c97bfff8ccec939ffb3105dcc451b69dff
Author: Mai Lavelle
Date: Tue Mar 7 07:43:28 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBdc5367c97bfff8ccec939ffb3105dcc451b69dff
Merge branch 'master' into cycles_split_kernel
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel_shader.h
index 635365b570,59c1331a63..a2ab96b35e
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@@ -685,6 -685,18 +685,18 @@@ ccl_device float3 shader_bsdf_transpare
return eval;
}
+ ccl_device void shader_bsdf_disable_transparency(KernelGlobals *kg,
ShaderData *sd)
+ {
- for(int i = 0; i < ccl_fetch(sd, num_closure); i++) {
- ShaderClosure *sc = ccl_fetch_array(sd, closure, i);
++ for(int i = 0; i < sd->num_closure; i++) {
++ ShaderClosure *sc = &sd->closure[i];
+
+ if(sc->type == CLOSURE_BSDF_TRANSPARENT_ID) {
+ sc->sample_weight = 0.0f;
+ sc->weight = make_float3(0.0f, 0.0f, 0.0f);
+ }
+ }
+ }
+
ccl_device float3 shader_bsdf_alpha(KernelGlobals *kg, ShaderData *sd)
{
float3 alpha = make_float3(1.0f, 1.0f, 1.0f) -
shader_bsdf_transparency(kg, sd);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
