From 933f012def618e56ff92dde683e95652b8c85c43 Mon Sep 17 00:00:00 2001 From: sconel Date: Thu, 27 May 2021 10:50:56 -0700 Subject: [PATCH] Code cleanup, removed pragma optimize macro --- .../UI/PropertyEditor/PropertyAssetCtrl.cpp | 11 +---------- .../ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp index 4bf261122d..dd39cf9b97 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp @@ -802,16 +802,7 @@ namespace AzToolsFramework AZ_Assert(product || folder, "Incorrect entry type selected. Expected product or folder."); if (product) { - AZ::Data::AssetId selectedAssetId = product->GetAssetId(); - - // If we hid the product files a source asset was picked - // Clear the sub id as a source could have N products with different sub ids - if (m_hideProductFilesInAssetPicker) - { - selectedAssetId.m_subId = 0; - } - - SetSelectedAssetID(selectedAssetId); + SetSelectedAssetID(product->GetAssetId()); } else if (folder) { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp index 28d9af9bcd..37bb64745a 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp @@ -10,7 +10,6 @@ * */ -#pragma optimize("", off) #include #include