diff options
| author | Dalai Felinto <dalai@blender.org> | 2022-06-03 17:13:51 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2022-06-03 17:13:51 +0300 |
| commit | e7156be86e8daa13c43f4347349a91d7fcc51cc1 (patch) | |
| tree | 3b8eaec6a88d5c7e57a3976d0fa2cfa71e926908 /intern | |
| parent | e73fd4f0c03f9584eb3ac4aa3d1c07c83ddec759 (diff) | |
| parent | 0b38b8dafaa237ec2e7427db969055e84d2c72c9 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.2-release'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/integrator/shade_background.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/types.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/integrator/shade_background.h b/intern/cycles/kernel/integrator/shade_background.h index 62b3ce1c15c..72ecf67e8a0 100644 --- a/intern/cycles/kernel/integrator/shade_background.h +++ b/intern/cycles/kernel/integrator/shade_background.h @@ -48,7 +48,7 @@ ccl_device float3 integrator_eval_background_shader(KernelGlobals kg, PROFILING_SHADER(emission_sd->object, emission_sd->shader); PROFILING_EVENT(PROFILING_SHADE_LIGHT_EVAL); - shader_eval_surface<KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT>( + shader_eval_surface<KERNEL_FEATURE_NODE_MASK_SURFACE_BACKGROUND>( kg, state, emission_sd, render_buffer, path_flag | PATH_RAY_EMISSION); L = shader_background_eval(emission_sd); diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 80eccd6d41f..b1ca379bab8 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -1700,6 +1700,8 @@ enum KernelFeatureFlag : uint32_t { #define KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT \ (KERNEL_FEATURE_NODE_EMISSION | KERNEL_FEATURE_NODE_VORONOI_EXTRA | \ KERNEL_FEATURE_NODE_LIGHT_PATH) +#define KERNEL_FEATURE_NODE_MASK_SURFACE_BACKGROUND \ + (KERNEL_FEATURE_NODE_MASK_SURFACE_LIGHT | KERNEL_FEATURE_NODE_AOV) #define KERNEL_FEATURE_NODE_MASK_SURFACE_SHADOW \ (KERNEL_FEATURE_NODE_BSDF | KERNEL_FEATURE_NODE_EMISSION | KERNEL_FEATURE_NODE_VOLUME | \ KERNEL_FEATURE_NODE_BUMP | KERNEL_FEATURE_NODE_BUMP_STATE | \ |