[Bf-blender-cvs] [888ed6b] master: Cleanup comment and remove now redundant define.

Thomas Dinges noreply at git.blender.org
Mon Jun 15 23:55:07 CEST 2015


Commit: 888ed6b7f15bf30f978fabc134e1d35cf9fcee38
Author: Thomas Dinges
Date:   Mon Jun 15 23:35:38 2015 +0200
Branches: master
https://developer.blender.org/rB888ed6b7f15bf30f978fabc134e1d35cf9fcee38

Cleanup comment and remove now redundant define.

===================================================================

M	intern/cycles/kernel/kernel_path_branched.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_path_branched.h b/intern/cycles/kernel/kernel_path_branched.h
index 6190cd5..3fa38a6 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -56,7 +56,7 @@ ccl_device void kernel_branched_path_ao(KernelGlobals *kg, ShaderData *sd, PathR
 }
 
 
-/* branched path tracing: bounce off surface and integrate indirect light */
+/* bounce off surface and integrate indirect light */
 ccl_device_noinline void kernel_branched_path_surface_indirect_light(KernelGlobals *kg,
 	RNG *rng, ShaderData *sd, float3 throughput, float num_samples_adjust,
 	PathState *state, PathRadiance *L)
@@ -161,7 +161,7 @@ ccl_device void kernel_branched_path_subsurface_scatter(KernelGlobals *kg,
 				}
 #endif
 
-#if defined(__EMISSION__) && defined(__BRANCHED_PATH__)
+#ifdef __EMISSION__
 				/* direct light */
 				if(kernel_data.integrator.use_direct_light) {
 					bool all = kernel_data.integrator.sample_all_lights_direct;




More information about the Bf-blender-cvs mailing list