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
@@ -1,4 +0,0 @@
-[RC PostFxLayerCategories]
-glob=*.postfxlayercategories
-params=copy
-productAssetType={A18B1B11-4C1E-4C1B-9643-178E8ED27019}
@@ -0,0 +1,13 @@
+{
+    "Amazon": {
+        "AssetProcessor": {
+            "Settings": {
+                "RC PostFxLayerCategories": {
+                    "glob": "*.postfxlayercategories",
+                    "params": "copy",
+                    "productAssetType": "{A18B1B11-4C1E-4C1B-9643-178E8ED27019}"
+                }
+            }
+        }
+    }
+}
@@ -50,7 +50,6 @@ ly_add_target(
 ly_add_target(
    NAME AtomLyIntegration_CommonFeatures ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
    NAMESPACE Gem
-    OUTPUT_NAME Gem.AtomLyIntegration_CommonFeatures.4e981f3b17394f5d84d674fff0f54f4f.v0.1.0
    FILES_CMAKE
        atomlyintegration_commonfeatures_shared_files.cmake
    INCLUDE_DIRECTORIES
@@ -65,9 +64,9 @@ ly_add_target(

 if(PAL_TRAIT_BUILD_HOST_TOOLS)
    ly_add_target(
-        NAME AtomLyIntegration_CommonFeatures.Editor MODULE
+        NAME AtomLyIntegration_CommonFeatures.Editor GEM_MODULE
+
        NAMESPACE Gem
-        OUTPUT_NAME Gem.AtomLyIntegration_CommonFeatures.Editor.4e981f3b17394f5d84d674fff0f54f4f.v0.1.0
        AUTOUIC
        AUTOMOC
        AUTORCC
@@ -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();
        }