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

Addressing PR feedback

Browse Source 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
This commit is contained in:
Guthrie Adams
2021-09-20 15:24:03 -05:00
parent 5a2ae1d483
commit 376a6040d8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
+2 -2
View File
@@ -33,9 +33,9 @@ namespace AZ
virtual const MaterialAssignmentMap& GetMaterialOverrides() const = 0;
//! Clear all material overrides
virtual void ClearAllMaterialOverrides() = 0;
//! Clear non-lod material override
//! Clear non-lod material overrides
virtual void ClearModelMaterialOverrides() = 0;
//! Clear lod material override
//! Clear lod material overrides
virtual void ClearLodMaterialOverrides() = 0;
//! Clear residual materials that don't correspond to the associated model
virtual void ClearIncompatibleMaterialOverrides() = 0;
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
+2 -2
View File
@@ -364,9 +364,9 @@ namespace AZ
EditorMaterialComponentExporter::ExportItemsContainer exportItems;
exportItems.reserve(assetIdToSlotNameMap.size());
for (const auto& assetIdToSlotNamePair : assetIdToSlotNameMap)
for (const auto& [assetId, slotName] : assetIdToSlotNameMap)
{
exportItems.emplace_back(assetIdToSlotNamePair.first, assetIdToSlotNamePair.second);
exportItems.emplace_back(assetId, slotName);
}
// Display the export dialog so that the user can configure how they want different materials to be exported