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

Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950

Browse Source 
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
This commit is contained in:
Guthrie Adams
2021-04-19 14:46:11 -05:00
committed by GitHub
parent dc7cc77be6 8fead27c45
commit 3b4e424d38
13 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp
+10 -3
View File
@@ -278,7 +278,7 @@ namespace MaterialEditor
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnLightingPresetAdded, presetPtr);
if (preset.m_autoSelect || m_lightingPresetVector.size() == 1)
if (m_lightingPresetVector.size() == 1)
{
SelectLightingPreset(presetPtr);
}
@@ -373,7 +373,7 @@ namespace MaterialEditor
MaterialViewportNotificationBus::Broadcast(&MaterialViewportNotificationBus::Events::OnModelPresetAdded, presetPtr);
if (preset.m_autoSelect || m_modelPresetVector.size() == 1)
if (m_modelPresetVector.size() == 1)
{
SelectModelPreset(presetPtr);
}
@@ -510,6 +510,13 @@ namespace MaterialEditor
void MaterialViewportComponent::OnCatalogLoaded([[maybe_unused]] const char* catalogFile)
{
AZ::TickBus::QueueFunction([this]() { ReloadContent(); });
AZ::TickBus::QueueFunction([this]() {
ReloadContent();
// Automatically select preferred default presets if they exist
// We will later data drive this with editor settings
SelectLightingPresetByName("Neutral Urban");
SelectModelPresetByName("Shader Ball");
});
}
}