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

Fixed an issue where the wrong version number was being reported in a warning message. It showed the latest version instead of the original version number.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2021-10-21 12:13:45 -07:00
parent bf2997f960
commit f4d5a75574
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ namespace AZ
if (changesWereApplied)
{
AZ_Warning("MaterialSourceData", false,
"This material is based on version %u of '%s', but the material type is now at version %u. "
"This material is based on version '%u' of '%s', but the material type is now at version '%u'. "
"Automatic updates are available. Consider updating the .material source file.",
m_materialTypeVersion, m_materialType.c_str(), materialTypeSourceData.m_version);
}
Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+4 -2
View File
@@ -208,6 +208,8 @@ namespace AZ
return;
}
const uint32_t originalVersion = m_materialTypeVersion;
bool changesWereApplied = false;
for (const MaterialVersionUpdate& versionUpdate : m_materialTypeAsset->GetMaterialVersionUpdateList())
@@ -225,9 +227,9 @@ namespace AZ
if (changesWereApplied)
{
AZ_Warning("MaterialAsset", false,
"This material is based on version %u of '%s', but the material type is now at version %u. "
"This material is based on version '%u' of %s, but the material type is now at version '%u'. "
"Automatic updates are available. Consider updating the .material source file.",
m_materialTypeVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion());
originalVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion());
}
m_materialTypeVersion = m_materialTypeAsset->GetVersion();
Gems/Atom/RPI/Code/Tests/Material/MaterialAssetTests.cpp
+2
View File
@@ -264,6 +264,8 @@ namespace UnitTest
// This can find errors and warnings, we are looking for a warning when the version update is applied
ErrorMessageFinder warningFinder;
warningFinder.AddExpectedErrorMessage("Automatic updates are available. Consider updating the .material source file");
warningFinder.AddExpectedErrorMessage("This material is based on version '1'");
warningFinder.AddExpectedErrorMessage("material type is now at version '2'");
// Even though this material was created using the old version of the material type, it's property values should get automatically
// updated to align with the new property layout in the latest MaterialTypeAsset.
Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp
+2
View File
@@ -728,6 +728,8 @@ namespace UnitTest
// Then we force the material data to update to the latest material type version specification
ErrorMessageFinder warningFinder; // Note this finds errors and warnings, and we're looking for a warning.
warningFinder.AddExpectedErrorMessage("Automatic updates are available. Consider updating the .material source file");
warningFinder.AddExpectedErrorMessage("This material is based on version '1'");
warningFinder.AddExpectedErrorMessage("material type is now at version '10'");
material.ApplyVersionUpdates();
warningFinder.CheckExpectedErrorsFound();