[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53826] trunk/blender/intern/cycles/kernel /kernel_accumulate.h: Fix CUDA compile after last commit.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Jan 15 21:13:21 CET 2013
Revision: 53826
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53826
Author: blendix
Date: 2013-01-15 20:13:19 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Fix CUDA compile after last commit.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/kernel_accumulate.h
Modified: trunk/blender/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_accumulate.h 2013-01-15 19:44:41 UTC (rev 53825)
+++ trunk/blender/intern/cycles/kernel/kernel_accumulate.h 2013-01-15 20:13:19 UTC (rev 53826)
@@ -272,6 +272,7 @@
__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 @@
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 @@
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)
More information about the Bf-blender-cvs
mailing list