Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15

# Conflicts: # Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
parent aade48e751 bd2a2ebcf5
commit 9ca0e731f4
186 changed files with 12473 additions and 11586 deletions
@@ -382,6 +382,16 @@ namespace AZ
            m_useViewport = false;
        }

+        void DynamicDrawContext::SetStencilReference(uint8_t stencilRef)
+        {
+            m_stencilRef = stencilRef;
+        }
+
+        uint8_t DynamicDrawContext::GetStencilReference() const
+        {
+            return m_stencilRef;
+        }
+
        void DynamicDrawContext::SetShaderVariant(ShaderVariantId shaderVariantId)
        {
            AZ_Assert( m_initialized && m_supportShaderVariants, "DynamicDrawContext is not initialized or unable to support shader variants. "
@@ -475,6 +485,9 @@ namespace AZ
                drawItem.m_viewports = &m_viewport;
            }

+            // Set stencil reference. Used when stencil is enabled.
+            drawItem.m_stencilRef = m_stencilRef;
+
            drawItemInfo.m_sortKey = m_sortKey++;
            m_cachedDrawItems.emplace_back(drawItemInfo);
        }