[Bf-blender-cvs] [56fa6f58a0f] master: Fix T93874: Cycles crash with fast GI approximation

Brecht Van Lommel noreply at git.blender.org
Thu Dec 9 18:29:27 CET 2021


Commit: 56fa6f58a0f8aaf2fa23fd08e6b104816b3af2e1
Author: Brecht Van Lommel
Date:   Thu Dec 9 17:46:21 2021 +0100
Branches: master
https://developer.blender.org/rB56fa6f58a0f8aaf2fa23fd08e6b104816b3af2e1

Fix T93874: Cycles crash with fast GI approximation

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

M	intern/cycles/kernel/integrator/path_state.h

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

diff --git a/intern/cycles/kernel/integrator/path_state.h b/intern/cycles/kernel/integrator/path_state.h
index e79497320af..ff6b55a73c3 100644
--- a/intern/cycles/kernel/integrator/path_state.h
+++ b/intern/cycles/kernel/integrator/path_state.h
@@ -70,6 +70,9 @@ ccl_device_inline void path_state_init_integrator(KernelGlobals kg,
   INTEGRATOR_STATE_WRITE(state, path, continuation_probability) = 1.0f;
   INTEGRATOR_STATE_WRITE(state, path, throughput) = make_float3(1.0f, 1.0f, 1.0f);
 
+  INTEGRATOR_STATE_WRITE(state, isect, object) = OBJECT_NONE;
+  INTEGRATOR_STATE_WRITE(state, isect, prim) = PRIM_NONE;
+
   if (kernel_data.kernel_features & KERNEL_FEATURE_VOLUME) {
     INTEGRATOR_STATE_ARRAY_WRITE(state, volume_stack, 0, object) = OBJECT_NONE;
     INTEGRATOR_STATE_ARRAY_WRITE(



More information about the Bf-blender-cvs mailing list