[Bf-blender-cvs] [91d365f6df5] blender-v3.3-release: Fix T100205: Cycles wrong volume shading with two materials in object

[Brecht Van Lommel]

Commit: 91d365f6df51333757a47b8c18cfd9faae974982
Author: Brecht Van Lommel
Date:   Thu Aug 4 18:57:05 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB91d365f6df51333757a47b8c18cfd9faae974982

Fix T100205: Cycles wrong volume shading with two materials in object

Assume that all faces using the smae material form a closed mesh, so that
joining meshes gives the same result as separate meshes.

It does mean that using different materials on different sides of one
closed mesh do not work, but the meaning of that is poorly defined anyway
if there is a volume interior.

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

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

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

diff --git a/intern/cycles/kernel/integrator/volume_stack.h b/intern/cycles/kernel/integrator/volume_stack.h
index 97a0f0f386c..675e1927fc0 100644
--- a/intern/cycles/kernel/integrator/volume_stack.h
+++ b/intern/cycles/kernel/integrator/volume_stack.h
@@ -39,7 +39,7 @@ ccl_device void volume_stack_enter_exit(KernelGlobals kg,
         break;
       }
 
-      if (entry.object == sd->object) {
+      if (entry.object == sd->object && entry.shader == sd->shader) {
         /* Shift back next stack entries. */
         do {
           entry = stack_read(i + 1);
@@ -61,7 +61,7 @@ ccl_device void volume_stack_enter_exit(KernelGlobals kg,
       }
 
       /* Already in the stack? then we have nothing to do. */
-      if (entry.object == sd->object) {
+      if (entry.object == sd->object && entry.shader == sd->shader) {
         return;
       }
     }