Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -255,6 +255,10 @@ namespace AZ

        void MaterialComponentController::SetMaterialOverrides(const MaterialAssignmentMap& materials)
        {
+            // this function is called twice once material asset is changed, a temp variable is
+            // needed to prevent material asset going out of scope during second call
+            // before LoadMaterials() is called [LYN-2249]
+            auto temp = m_configuration.m_materials; 
            m_configuration.m_materials = materials;
            LoadMaterials();
        }