Merge branch 'development' into Atom/guthadam/thumbnail_and_preview_refactor

This commit is contained in:
Guthrie Adams
2021-10-13 20:37:36 -05:00
156 changed files with 3978 additions and 1140 deletions
@@ -532,9 +532,9 @@ namespace AZ
{
if (IsInstanceNodePropertyModifed(node))
{
return ":/PropertyEditor/Resources/changed_data_item.png";
return ":/Icons/changed_property.svg";
}
return ":/PropertyEditor/Resources/blank.png";
return ":/Icons/blank.png";
}
bool MaterialPropertyInspector::SaveMaterial() const