Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-16 00:13:19 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-01-16 00:13:19 +0400
commit486abf01c6a08797eb398641e7c19fb334e032ff (patch)
treec2569eb4fb730da4e6d786fd1a4fcc37e2a5e19b /intern/cycles/kernel/kernel_accumulate.h
parent3373b8154b16d345b0e1fcbdb55d03d8ec088006 (diff)
Fix CUDA compile after last commit.
Diffstat (limited to 'intern/cycles/kernel/kernel_accumulate.h')
-rw-r--r--intern/cycles/kernel/kernel_accumulate.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 23bd29840ec..86177301357 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -272,6 +272,7 @@ __device_inline void path_radiance_accum_background(PathRadiance *L, float3 thro
__device_inline void path_radiance_sum_indirect(PathRadiance *L)
{
+#ifdef __PASSES__
/* this division is a bit ugly, but means we only have to keep track of
* only a single throughput further along the path, here we recover just
* the indirect parth that is not influenced by any particular BSDF type */
@@ -286,10 +287,12 @@ __device_inline void path_radiance_sum_indirect(PathRadiance *L)
L->indirect_glossy += L->path_glossy*L->indirect;
L->indirect_transmission += L->path_transmission*L->indirect;
}
+#endif
}
__device_inline void path_radiance_reset_indirect(PathRadiance *L)
{
+#ifdef __PASSES__
if(L->use_light_pass) {
L->path_diffuse = make_float3(0.0f, 0.0f, 0.0f);
L->path_glossy = make_float3(0.0f, 0.0f, 0.0f);
@@ -298,6 +301,7 @@ __device_inline void path_radiance_reset_indirect(PathRadiance *L)
L->direct_emission = make_float3(0.0f, 0.0f, 0.0f);
L->indirect = make_float3(0.0f, 0.0f, 0.0f);
}
+#endif
}
__device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L)