|
@@ -44,6 +44,7 @@ namespace AZ
|
|
|
->Event("GetMaterialLabel", &MaterialComponentRequestBus::Events::GetMaterialLabel, "GetMaterialSlotLabel")
|
|
|
->Event("SetMaterialMap", &MaterialComponentRequestBus::Events::SetMaterialMap, "SetMaterialOverrides")
|
|
|
->Event("GetMaterialMap", &MaterialComponentRequestBus::Events::GetMaterialMap, "GetMaterialOverrides")
|
|
|
+ ->Event("GetMaterialMapCopy", &MaterialComponentRequestBus::Events::GetMaterialMapCopy)
|
|
|
->Event("ClearMaterialMap", &MaterialComponentRequestBus::Events::ClearMaterialMap, "ClearAllMaterialOverrides")
|
|
|
->Event("SetMaterialAssetIdOnDefaultSlot", &MaterialComponentRequestBus::Events::SetMaterialAssetIdOnDefaultSlot, "SetDefaultMaterialOverride")
|
|
|
->Event("GetMaterialAssetIdOnDefaultSlot", &MaterialComponentRequestBus::Events::GetMaterialAssetIdOnDefaultSlot, "GetDefaultMaterialOverride")
|
|
@@ -237,7 +238,8 @@ namespace AZ
|
|
|
if (!m_queuedLoadMaterials &&
|
|
|
!m_queuedMaterialsCreatedNotification &&
|
|
|
!m_queuedMaterialsUpdatedNotification &&
|
|
|
- m_materialsWithDirtyProperties.empty())
|
|
|
+ m_materialsWithDirtyProperties.empty() &&
|
|
|
+ m_notifiedMaterialAssets.empty())
|
|
|
{
|
|
|
SystemTickBus::Handler::BusDisconnect();
|
|
|
}
|
|
@@ -413,6 +415,11 @@ namespace AZ
|
|
|
return m_configuration.m_materials;
|
|
|
}
|
|
|
|
|
|
+ MaterialAssignmentMap MaterialComponentController::GetMaterialMapCopy() const
|
|
|
+ {
|
|
|
+ return m_configuration.m_materials;
|
|
|
+ }
|
|
|
+
|
|
|
void MaterialComponentController::ClearMaterialMap()
|
|
|
{
|
|
|
if (!m_configuration.m_materials.empty())
|