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

Resolve PR comments.

Browse Source 
Signed-off-by: Robin <rbarrand@amazon.com>
This commit is contained in:
Robin
2021-09-29 10:04:49 -07:00
parent ca06e2e82d
commit acff45446a
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp
+12 -7
View File
@@ -311,16 +311,21 @@ namespace AZ
// Set materialtype version and add each version update object into MaterialTypeAsset.
materialTypeAssetCreator.SetVersion(m_version);
for (const auto& versionUpdate : m_versionUpdates)
{
MaterialVersionUpdate materialVersionUpdate;
for (const auto& action : versionUpdate.m_actions)
const AZ::Name rename = AZ::Name{ "rename" };
const AZ::Name from = AZ::Name{ "from" };
const AZ::Name to = AZ::Name{ "to" };
for (const auto& versionUpdate : m_versionUpdates)
{
materialVersionUpdate.AddAction(MaterialVersionUpdate::Action(AZ::Name{ "rename" }, {
{ AZ::Name{ "from" }, AZ::Name{ action.m_renameFrom } },
{ AZ::Name{ "to" }, AZ::Name{ action.m_renameTo } } }));
MaterialVersionUpdate materialVersionUpdate;
for (const auto& action : versionUpdate.m_actions)
{
materialVersionUpdate.AddAction(MaterialVersionUpdate::Action(rename, {
{ from, AZ::Name{ action.m_renameFrom } },
{ to, AZ::Name{ action.m_renameTo } } }));
}
materialTypeAssetCreator.AddVersionUpdate(versionUpdate.m_toVersion, materialVersionUpdate);
}
materialTypeAssetCreator.AddVersionUpdate(versionUpdate.m_toVersion, materialVersionUpdate);
}
// Used to gather all the UV streams used in this material type from its shaders in alphabetical order.
Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+1 -1
View File
@@ -195,7 +195,7 @@ namespace AZ
void MaterialAsset::ApplyVersionUpdates()
{
for (int i = 0; i < static_cast<int>(m_materialTypeAsset->GetVersion() - m_materialTypeVersion); ++i)
for (int i = 0; i < aznumeric_cast<int>(m_materialTypeAsset->GetVersion() - m_materialTypeVersion); ++i)
{
const auto& versionUpdate = m_materialTypeAsset->GetMaterialVersionUpdate(m_materialTypeVersion + i + 1);