[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59925] trunk/blender/intern/cycles/kernel /kernel_path.h: Cycles:

[Thomas Dinges]

Revision: 59925
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59925
Author:   dingto
Date:     2013-09-08 17:20:47 +0000 (Sun, 08 Sep 2013)
Log Message:
-----------
Cycles:
* Fix some compile errors, when building without Branched Path. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_path.h

Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h	2013-09-08 14:01:14 UTC (rev 59924)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h	2013-09-08 17:20:47 UTC (rev 59925)
@@ -232,7 +232,7 @@
 }
 
 
-#if defined(__BRANCHED_PATH__) || defined(__BSSRDF__)
+#if defined(__BRANCHED_PATH__) || defined(__SUBSURFACE__)
 
 __device void kernel_path_indirect(KernelGlobals *kg, RNG *rng, int sample, Ray ray, __global float *buffer,
 	float3 throughput, int num_samples, int num_total_samples,
@@ -290,7 +290,9 @@
 		shader_setup_from_ray(kg, &sd, &isect, &ray, state.bounce);
 		float rbsdf = path_rng_1D(kg, rng, sample, num_total_samples, rng_offset + PRNG_BSDF);
 		shader_eval_surface(kg, &sd, rbsdf, state.flag, SHADER_CONTEXT_INDIRECT);
+#ifdef __BRANCHED_PATH__
 		shader_merge_closures(kg, &sd);
+#endif
 
 		/* blurring of bsdf after bounces, for rays that have a small likelihood
 		 * of following this particular path (diffuse, rough glossy) */