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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/ATLControlsModel.cpp
-1
View File
@@ -64,7 +64,6 @@ namespace AudioControls
{
if (id != ACE_INVALID_CID)
{
size_t size = m_controls.size();
for (auto it = m_controls.begin(); it != m_controls.end(); ++it)
{
AZStd::shared_ptr<CATLControl>& control = *it;
Gems/AudioSystem/Code/Source/Editor/ATLControlsPanel.cpp
-1
View File
@@ -571,7 +571,6 @@ namespace AudioControls
CATLControl* pControl = GetControlFromIndex(m_pATLControlsTree->currentIndex());
if (pControl)
{
EACEControlType eControlType = pControl->GetType();
switch (pControl->GetType())
{
case eACET_TRIGGER:
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
-1
View File
@@ -128,7 +128,6 @@ namespace AudioControls
//-------------------------------------------------------------------------------------------//
void CAudioControlsEditorWindow::keyPressEvent(QKeyEvent* pEvent)
{
uint16 mod = pEvent->modifiers();
if (pEvent->key() == Qt::Key_S && pEvent->modifiers() == Qt::ControlModifier)
{
Save();
Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
+1 -2
View File
@@ -26,8 +26,7 @@ namespace AudioControls
//-------------------------------------------------------------------------------------------//
QString ShowSelectDialog(const SResourceSelectorContext& context, const QString& pPreviousValue, const EACEControlType controlType)
{
CATLControlsModel* pModel = CAudioControlsEditorPlugin::GetATLModel();
AZ_Assert(pModel != nullptr, "AudioResourceSelectors - ATL Model is null!");
AZ_Assert(CAudioControlsEditorPlugin::GetATLModel() != nullptr, "AudioResourceSelectors - ATL Model is null!");
AZStd::string levelName;
AzToolsFramework::EditorRequestBus::BroadcastResult(levelName, &AzToolsFramework::EditorRequests::GetLevelName);
Gems/AudioSystem/Code/Source/Engine/ATL.cpp
-1
View File
@@ -482,7 +482,6 @@ namespace Audio
}
case eAMRT_INIT_AUDIO_IMPL:
{
auto const pRequestData = static_cast<const SAudioManagerRequestDataInternal<eAMRT_INIT_AUDIO_IMPL>*>(rRequest.pData.get());
eResult = InitializeImplComponent();
// Initializing the implementation failed, immediately release it...
Gems/AudioSystem/Code/Source/Engine/ATLComponents.cpp
+1 -1
View File
@@ -616,7 +616,7 @@ namespace Audio
AudioSystemImplementationRequestBus::BroadcastResult(eResult, &AudioSystemImplementationRequestBus::Events::UnregisterAudioObject, implObject);
AZ_Error("CAudioObjectManager", eResult == eARS_SUCCESS, "Failed to Unregister Audio Object!");
AudioSystemImplementationRequestBus::BroadcastResult(eResult, &AudioSystemImplementationRequestBus::Events::ResetAudioObject, implObject);
AZ_Error("CAudioObjectManager", eResult = eARS_SUCCESS, "Failed to Reset Audio Object!");
AZ_Error("CAudioObjectManager", eResult == eARS_SUCCESS, "Failed to Reset Audio Object!");
AudioSystemImplementationRequestBus::Broadcast(&AudioSystemImplementationRequestBus::Events::DeleteAudioObjectData, implObject);
pAudioObject->SetImplDataPtr(nullptr);
}