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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-07-17 13:09:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-07-18 10:27:36 +0300
commitd8906f30d358eb03ff19578298003bb6ca7fa760 (patch)
treee636a241a087e70873727d03a0e15dc7781e5c93 /intern
parent66383ea206d882fd8737c8e8da5355095e614bc8 (diff)
Cycles: Remove meaningless camera ray check
In branched path tracing main loop is always a camera ray, with varying number of transparent bounces.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_path_branched.h10
1 files changed, 4 insertions, 6 deletions
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 {