birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update reflection version markers.

Browse Source 
Signed-off-by: Robin <rbarrand@amazon.com>
This commit is contained in:
Robin
2021-09-27 23:44:13 -07:00
parent 503e565a53
commit ca06e2e82d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+2 -2
View File
@@ -95,7 +95,7 @@ namespace AZ
; ;
serializeContext->Class<PropertyLayout>() serializeContext->Class<PropertyLayout>()
->Version(2) ->Version(2) // Material Version Update
->Field("groups", &PropertyLayout::m_groups) ->Field("groups", &PropertyLayout::m_groups)
->Field("properties", &PropertyLayout::m_properties) ->Field("properties", &PropertyLayout::m_properties)
; ;
@@ -103,7 +103,7 @@ namespace AZ
serializeContext->RegisterGenericType<UvNameMap>(); serializeContext->RegisterGenericType<UvNameMap>();
serializeContext->Class<MaterialTypeSourceData>() serializeContext->Class<MaterialTypeSourceData>()
->Version(4) ->Version(4) // Material Version Update
->Field("description", &MaterialTypeSourceData::m_description) ->Field("description", &MaterialTypeSourceData::m_description)
->Field("version", &MaterialTypeSourceData::m_version) ->Field("version", &MaterialTypeSourceData::m_version)
->Field("versionUpdates", &MaterialTypeSourceData::m_versionUpdates) ->Field("versionUpdates", &MaterialTypeSourceData::m_versionUpdates)
Gems/Atom/RPI/Code/Tests/Material/MaterialTypeAssetTests.cpp
+1 -1
View File
@@ -207,7 +207,7 @@ namespace UnitTest
{ {
EXPECT_EQ(m_testMaterialSrgLayout, materialTypeAsset->GetMaterialSrgLayout()); EXPECT_EQ(m_testMaterialSrgLayout, materialTypeAsset->GetMaterialSrgLayout());
EXPECT_EQ(5, materialTypeAsset->GetMaterialPropertiesLayout()->GetPropertyCount()); EXPECT_EQ(5, materialTypeAsset->GetMaterialPropertiesLayout()->GetPropertyCount());
//EXPECT_EQ(2, materialTypeAsset->GetVersion()); EXPECT_EQ(2, materialTypeAsset->GetVersion());
// Check aliased properties // Check aliased properties
const MaterialPropertyIndex colorIndex = materialTypeAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(Name{ "MyColor" }); const MaterialPropertyIndex colorIndex = materialTypeAsset->GetMaterialPropertiesLayout()->FindPropertyIndex(Name{ "MyColor" });