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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialPropertyValueSourceData.cpp
+1 -2
View File
@@ -50,7 +50,6 @@ namespace AZ
return false;
}
MaterialPropertyDataType dataType = propertyDescriptor->GetDataType();
AZ::TypeId typeId = propertyDescriptor->GetStorageDataTypeId();
auto iter = m_possibleValues.find(typeId);
if (iter != m_possibleValues.end())
@@ -60,7 +59,7 @@ namespace AZ
if (!m_resolvedValue.IsValid())
{
AZ_Error("MaterialPropertyValueSourceData", false, "Value for material property '%s' is invalid. %s is required.", materialPropertyName.GetCStr(), ToString(dataType));
AZ_Error("MaterialPropertyValueSourceData", false, "Value for material property '%s' is invalid. %s is required.", materialPropertyName.GetCStr(), ToString(propertyDescriptor->GetDataType()));
return false;
}