Merge branch 'development' into Atom/guthadam/multiple_dockable_pinned_material_component_property_editor

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-09-15 18:45:22 -05:00
parent d07b115569 0f5fc1de4d
commit 825e523483
39 changed files with 779 additions and 338 deletions
@@ -222,6 +222,16 @@ namespace AZ
                &AzToolsFramework::ToolsApplicationEvents::InvalidatePropertyDisplay, AzToolsFramework::Refresh_AttributesAndValues);
        }

+        void EditorMaterialComponent::OnMaterialInstanceCreated(const MaterialAssignment& materialAssignment)
+        {
+            // PSO-impacting property changes are allowed in the editor
+            // because the saved slice data can be analyzed to pre-compile the necessary PSOs.
+            if (materialAssignment.m_materialInstance)
+            {
+                materialAssignment.m_materialInstance->SetPsoHandlingOverride(AZ::RPI::MaterialPropertyPsoHandling::Allowed);
+            }
+        }
+
        AZ::u32 EditorMaterialComponent::OnConfigurationChanged()
        {
            return AZ::Edit::PropertyRefreshLevels::AttributesAndValues;