[Bf-blender-cvs] [d6b4fb6429] master: Cycles: Fix mistake in previous split kernel commits

Sergey Sharybin noreply at git.blender.org
Fri Mar 17 11:56:33 CET 2017


Commit: d6b4fb6429443a3550a953b7cc131e50f1ad2875
Author: Sergey Sharybin
Date:   Fri Mar 17 11:55:59 2017 +0100
Branches: master
https://developer.blender.org/rBd6b4fb6429443a3550a953b7cc131e50f1ad2875

Cycles: Fix mistake in previous split kernel commits

Own stupid mistake. Reported by nirved in IRC, thanks!

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

M	intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h

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

diff --git a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
index e4bf513ffd..1834a791b9 100644
--- a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
+++ b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
@@ -263,7 +263,7 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
 	                        QUEUE_SHADOW_RAY_CAST_AO_RAYS,
 	                        enqueue_flag_AO_SHADOW_RAY_CAST,
 	                        kernel_split_params.queue_size,
-	                        &locals->queue_atomics_bg,
+	                        &locals->queue_atomics_ao,
 	                        kernel_split_state.queue_data,
 	                        kernel_split_params.queue_index);
 #endif




More information about the Bf-blender-cvs mailing list