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

Minor updates in response to code review feedback.

Browse Source 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
This commit is contained in:
santorac
2021-10-23 00:02:31 -07:00
parent cef1e200f6
commit a892181432
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentInspector.cpp
+2 -4
View File
@@ -352,7 +352,7 @@ namespace AZ
m_editData.m_materialPropertyOverrideMap, m_entityId, &MaterialComponentRequestBus::Events::GetPropertyOverrides,
m_materialAssignmentId);
// Apply any automatic property renames so that the material inspector will be property initialized with the right values
// Apply any automatic property renames so that the material inspector will be properly initialized with the right values
// for properties that have new names.
{
AZStd::vector<AZStd::pair<Name, Name>> renamedProperties;
@@ -364,10 +364,8 @@ namespace AZ
renamedProperties.emplace_back(propertyOverridePair.first, name);
}
}
for (auto& renamePair : renamedProperties)
for (const auto& [oldName, newName] : renamedProperties)
{
const Name& oldName = renamePair.first;
const Name& newName = renamePair.second;
m_editData.m_materialPropertyOverrideMap[newName] = m_editData.m_materialPropertyOverrideMap[oldName];
m_editData.m_materialPropertyOverrideMap.erase(oldName);
}
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
+2 -4
View File
@@ -428,11 +428,9 @@ namespace AZ
++propertiesUpdated;
}
}
for (auto& pair : renamedProperties)
for (const auto& [oldName, newName] : renamedProperties)
{
const Name& oldName = pair.first;
const Name& newName = pair.second;
materialAssignment.m_propertyOverrides[newName] = materialAssignment.m_propertyOverrides[oldName];
materialAssignment.m_propertyOverrides.erase(oldName);
}