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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-10-29 19:50:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-10-29 19:52:56 +0300
commit537f41250f1025c71bdcf8c55a32da1b81de5a4c (patch)
treebbf093acb63e7214deb0318c72e3799475880082
parent3300b1f23249819a3cb6d279c2b2425f97fde3f6 (diff)
Cycles: Fix typo in split kernel
Shadow blocked kernel was using wrong array for storing intersection.
-rw-r--r--intern/cycles/kernel/split/kernel_shadow_blocked.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/kernel/split/kernel_shadow_blocked.h b/intern/cycles/kernel/split/kernel_shadow_blocked.h
index a3b9f23116c..290424e2ecb 100644
--- a/intern/cycles/kernel/split/kernel_shadow_blocked.h
+++ b/intern/cycles/kernel/split/kernel_shadow_blocked.h
@@ -73,10 +73,12 @@ ccl_device void kernel_shadow_blocked(
ccl_global Ray *light_ray_global =
shadow_blocked_type == RAY_SHADOW_RAY_CAST_AO
- ? light_ray_ao_global
- : light_ray_dl_global;
+ ? light_ray_ao_global
+ : light_ray_dl_global;
Intersection *isect_global =
- RAY_SHADOW_RAY_CAST_AO ? isect_ao_global : isect_dl_global;
+ shadow_blocked_type == RAY_SHADOW_RAY_CAST_AO
+ ? isect_ao_global
+ : isect_dl_global;
float3 shadow;
update_path_radiance = !(shadow_blocked(kg,