[Bf-blender-cvs] [53e7c64be7f] master: Fix T91597: Cycles volume scatter visibility on lights not working

[Brecht Van Lommel]

Commit: 53e7c64be7f1c7aebf65aa6082ec51146da387f5
Author: Brecht Van Lommel
Date:   Wed Sep 22 15:37:06 2021 +0200
Branches: master
https://developer.blender.org/rB53e7c64be7f1c7aebf65aa6082ec51146da387f5

Fix T91597: Cycles volume scatter visibility on lights not working

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

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

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

diff --git a/intern/cycles/kernel/integrator/integrator_shade_volume.h b/intern/cycles/kernel/integrator/integrator_shade_volume.h
index d44890f800e..095a28ac505 100644
--- a/intern/cycles/kernel/integrator/integrator_shade_volume.h
+++ b/intern/cycles/kernel/integrator/integrator_shade_volume.h
@@ -726,6 +726,10 @@ ccl_device_forceinline void integrate_volume_direct_light(INTEGRATOR_STATE_ARGS,
     }
   }
 
+  if (ls->shader & SHADER_EXCLUDE_SCATTER) {
+    return;
+  }
+
   /* Evaluate light shader.
    *
    * TODO: can we reuse sd memory? In theory we can move this after