From 2ad8804c0479980a6f4db144db4e0949b35ed798 Mon Sep 17 00:00:00 2001 From: Eric Phister <52085794+amzn-phist@users.noreply.github.com> Date: Fri, 25 Jun 2021 16:40:36 -0500 Subject: [PATCH] Fixes icons not displaying in AudioControlsEditor (#1596) The qrc files appeared to be set up correctly, but needed to add a Q_INIT_RESOURCE call to the code. --- .../Code/Source/Editor/AudioSystemEditor_wwise.cpp | 11 +++++++++++ .../Code/Source/Editor/AudioSystemEditor_wwise.h | 2 +- .../Code/Source/Editor/AudioControlsEditorWindow.cpp | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp index ac7aa7bd04..b585c00f19 100644 --- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp +++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.cpp @@ -23,6 +23,11 @@ #include #include +void InitWwiseResources() +{ + Q_INIT_RESOURCE(EditorWwise); +} + namespace AudioControls { //-------------------------------------------------------------------------------------------// @@ -80,6 +85,12 @@ namespace AudioControls return ""; } + //-------------------------------------------------------------------------------------------// + CAudioSystemEditor_wwise::CAudioSystemEditor_wwise() + { + InitWwiseResources(); + } + //-------------------------------------------------------------------------------------------// void CAudioSystemEditor_wwise::Reload() { diff --git a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h index 23179e62de..005123d20f 100644 --- a/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h +++ b/Gems/AudioEngineWwise/Code/Source/Editor/AudioSystemEditor_wwise.h @@ -63,7 +63,7 @@ namespace AudioControls friend class CAudioWwiseLoader; public: - CAudioSystemEditor_wwise() = default; + CAudioSystemEditor_wwise(); ~CAudioSystemEditor_wwise() override = default; ////////////////////////////////////////////////////////// diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp index abe5a8a58e..6ffcdb0262 100644 --- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp +++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp @@ -30,6 +30,11 @@ #include #include +void InitACEResources() +{ + Q_INIT_RESOURCE(AudioControlsEditorUI); +} + namespace AudioControls { //-------------------------------------------------------------------------------------------// @@ -40,6 +45,8 @@ namespace AudioControls CAudioControlsEditorWindow::CAudioControlsEditorWindow(QWidget* parent) : QMainWindow(parent) { + InitACEResources(); + setupUi(this); m_pATLModel = CAudioControlsEditorPlugin::GetATLModel();