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

Merge pull request #5764 from aws-lumberyard-dev/Atom/guthadam/include_material_asset_in_version_warnings

Browse Source 
Updated material version warning messages to include the affected asset
This commit is contained in:
Guthrie Adams
2021-11-19 13:13:15 -06:00
committed by GitHub
parent c0080d6b1f b89f5ee0c4
commit d0bf5e9eba
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp
+4 -3
View File
@@ -116,10 +116,11 @@ namespace AZ
{
m_properties = AZStd::move(newPropertyGroups);
AZ_Warning("MaterialSourceData", false,
AZ_Warning(
"MaterialSourceData", false,
"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);
"Automatic updates are available. Consider updating the .material source file: '%s'.",
m_materialTypeVersion, materialTypeFullPath.c_str(), materialTypeSourceData.m_version, materialSourceFilePath.data());
}
m_materialTypeVersion = materialTypeSourceData.m_version;
Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp
+5 -3
View File
@@ -226,10 +226,12 @@ namespace AZ
if (changesWereApplied)
{
AZ_Warning("MaterialAsset", false,
AZ_Warning(
"MaterialAsset", false,
"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.",
originalVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion());
"Automatic updates are available. Consider updating the .material source file for '%s'.",
originalVersion, m_materialTypeAsset.ToString<AZStd::string>().c_str(), m_materialTypeAsset->GetVersion(),
GetId().ToString<AZStd::string>().c_str());
}
m_materialTypeVersion = m_materialTypeAsset->GetVersion();