Commit: 137fd5ffcba7f049e50200114da8e231cc136189
Author: Mai Lavelle
Date: Tue Nov 28 16:58:57 2017 -0500
Branches: split-kernel-faster-building
https://developer.blender.org/rB137fd5ffcba7f049e50200114da8e231cc136189
Merge branch 'master' into split-kernel-faster-building
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel_path.h
index c43cdedac3b,c2421c1ec18..45c9764cc99
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@@ -185,31 -140,11 +185,31 @@@ ccl_device_forceinline bool kernel_path
L->transparent += average(throughput);
#ifdef __PASSES__
- if(!(kernel_data.film.pass_flag & PASS_BACKGROUND))
+ if(!(kernel_data.film.light_pass_flag & PASSMASK(BACKGROUND)))
#endif /* __PASSES__ */
- return;
+ return false;
}
+#ifdef __BACKGROUND__
+ /* sample background shader */
+ return indirect_background_setup(kg, sd, state, ray);
+#else
+ return false;
+#endif /* __BACKGROUND__ */
+}
+
+ccl_device_forceinline void kernel_path_background_finish(
+ KernelGlobals *kg,
+ ccl_addr_space PathState *state,
+ ccl_addr_space Ray *ray,
+ float3 throughput,
+ ShaderData *sd,
+ PathRadiance *L)
+{
+#ifdef __BACKGROUND__
+ /* sample background shader */
+ float3 L_background = indirect_background_finish(kg, sd, state, ray);
+
/* When using the ao bounces approximation, adjust background
* shader intensity with ao factor. */
if(path_state_ao_bounce(kg, state)) {
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
