Merge branch 'development' into cmake/SPEC-2513_w4267

2021-08-05 14:57:24 -07:00
parent e97c62c3e0 7448bccea3
commit 19d79f1559
171 changed files with 4614 additions and 2832 deletions
@@ -109,7 +109,7 @@ namespace AZ
            if (auto* serialize = azrtti_cast<SerializeContext*>(context))
            {
                serialize->Class<ModelAssetBuilderComponent, SceneAPI::SceneCore::ExportingComponent>()
-                    ->Version(29);  // (updated to separate material slot ID from default material asset)
+                    ->Version(30);  // (updated to separate material slot ID from default material asset)
            }
        }