Merge branch 'main' into pruiksma/ATOM-15561

2021-05-19 14:26:30 -05:00
parent ba478000ce 6a108c0515
commit 5802c4e1dc
144 changed files with 7583 additions and 741 deletions
@@ -93,11 +93,12 @@ namespace AZ
        void Pass::SetEnabled(bool enabled)
        {
            m_flags.m_enabled = enabled;
+            OnHierarchyChange();
        }

        bool Pass::IsEnabled() const
        {
-            return m_flags.m_enabled;
+            return m_flags.m_enabled && (m_flags.m_parentEnabled || m_parent == nullptr);
        }

        // --- Error Logging ---
@@ -140,6 +141,7 @@ namespace AZ
            }

            // Set new tree depth and path
+            m_flags.m_parentEnabled = m_parent->m_flags.m_enabled && (m_parent->m_flags.m_parentEnabled || m_parent->m_parent == nullptr);
            m_treeDepth = m_parent->m_treeDepth + 1;
            m_path = ConcatPassName(m_parent->m_path, m_name);
            m_flags.m_partOfHierarchy = m_parent->m_flags.m_partOfHierarchy;