[Bf-blender-cvs] [537f412] master: Cycles: Fix typo in split kernel
Sergey Sharybin
noreply at git.blender.org
Thu Oct 29 17:53:02 CET 2015
Commit: 537f41250f1025c71bdcf8c55a32da1b81de5a4c
Author: Sergey Sharybin
Date: Thu Oct 29 21:50:46 2015 +0500
Branches: master
https://developer.blender.org/rB537f41250f1025c71bdcf8c55a32da1b81de5a4c
Cycles: Fix typo in split kernel
Shadow blocked kernel was using wrong array for storing intersection.
===================================================================
M intern/cycles/kernel/split/kernel_shadow_blocked.h
===================================================================
diff --git a/intern/cycles/kernel/split/kernel_shadow_blocked.h b/intern/cycles/kernel/split/kernel_shadow_blocked.h
index a3b9f23..290424e 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,
More information about the Bf-blender-cvs
mailing list