[Bf-blender-cvs] [41d5ff6] master: Cycles: Avoid compilation warnings when building without passes support
Sergey Sharybin
noreply at git.blender.org
Sat Jun 13 19:08:25 CEST 2015
Commit: 41d5ff6fe9b283bfc5c68aad08003583b40f0e8a
Author: Sergey Sharybin
Date: Sat Jun 13 19:07:48 2015 +0200
Branches: master
https://developer.blender.org/rB41d5ff6fe9b283bfc5c68aad08003583b40f0e8a
Cycles: Avoid compilation warnings when building without passes support
===================================================================
M intern/cycles/kernel/kernel_accumulate.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 257728b..2dc87ff 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -341,12 +341,12 @@ ccl_device_inline void path_radiance_reset_indirect(PathRadiance *L)
ccl_device_inline float3 path_radiance_clamp_and_sum(KernelGlobals *kg, PathRadiance *L)
{
- float3 L_sum, L_direct, L_indirect;
- float clamp_direct = kernel_data.integrator.sample_clamp_direct;
- float clamp_indirect = kernel_data.integrator.sample_clamp_indirect;
-
+ float3 L_sum;
/* Light Passes are used */
#ifdef __PASSES__
+ float3 L_direct, L_indirect;
+ float clamp_direct = kernel_data.integrator.sample_clamp_direct;
+ float clamp_indirect = kernel_data.integrator.sample_clamp_indirect;
if(L->use_light_pass) {
path_radiance_sum_indirect(L);
More information about the Bf-blender-cvs
mailing list