[Bf-blender-cvs] [d8906f30d35] master: Cycles: Remove meaningless camera ray check

Sergey Sharybin noreply at git.blender.org
Tue Jul 18 09:53:18 CEST 2017


Commit: d8906f30d358eb03ff19578298003bb6ca7fa760
Author: Sergey Sharybin
Date:   Mon Jul 17 12:09:13 2017 +0200
Branches: master
https://developer.blender.org/rBd8906f30d358eb03ff19578298003bb6ca7fa760

Cycles: Remove meaningless camera ray check

In branched path tracing main loop is always a camera ray, with varying
number of transparent bounces.

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

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 10816d3e5d1..5f7f1a2ef14 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -499,12 +499,10 @@ ccl_device float kernel_branched_path_integrate(KernelGlobals *kg,
 
 #ifdef __SHADOW_TRICKS__
 		if((sd.object_flag & SD_OBJECT_SHADOW_CATCHER)) {
-			if(state.flag & PATH_RAY_CAMERA) {
-				state.flag |= (PATH_RAY_SHADOW_CATCHER | PATH_RAY_SHADOW_CATCHER_ONLY | PATH_RAY_STORE_SHADOW_INFO);
-				state.catcher_object = sd.object;
-				if(!kernel_data.background.transparent) {
-					L->shadow_color = indirect_background(kg, &emission_sd, &state, &ray);
-				}
+			state.flag |= (PATH_RAY_SHADOW_CATCHER | PATH_RAY_SHADOW_CATCHER_ONLY | PATH_RAY_STORE_SHADOW_INFO);
+			state.catcher_object = sd.object;
+			if(!kernel_data.background.transparent) {
+				L->shadow_color = indirect_background(kg, &emission_sd, &state, &ray);
 			}
 		}
 		else {




More information about the Bf-blender-cvs mailing list