Commit Graph

24 Commits

Author SHA1 Message Date
greerdv 3bbef11d15 Merge branch 'main' into non-uniform-scale-visibility 2021-04-15 14:17:11 +01:00
Nicholas Van Sickle 7484a983b8 Merge pull request #51 from aws-lumberyard-dev/nvsickle/EnableAtomViewport
Switch on the Atom-native viewport by default
2021-04-14 15:47:56 -07:00
SergeyAMZN 828bedf7a9 Merge pull request #38 from aws-lumberyard-dev/MultiplayerPipeline
Fixed dangling pointer in InitializeCatalog
2021-04-14 22:59:39 +01:00
Esteban Papp 90ad9f5141 SPEC-6266 Release Mode time sampling with AZ_TRACE_METHOD 2021-04-14 12:14:38 -07:00
nvsickle bf0db7a3c6 Merge remote-tracking branch 'upstream/main' into nvsickle/EnableAtomViewport 2021-04-14 10:47:18 -07:00
Mike Balfour efe5715e68 Merge branch 'main' into mbalfour/spec-6178 2021-04-14 12:07:58 -05:00
jackalbe a7a22bfcc0 Merge branch 'main' into sceneapi_script_autotest 2021-04-14 08:32:59 -05:00
pereslav 59252235d5 Fixed dangling pointer in InitializeCatalog 2021-04-14 13:13:01 +01:00
alexpete 8469c9ca0a Integrating github/staging through commit 5f214be 2021-04-13 17:18:57 -07:00
mbalfour d7f10e9d60 [LYN-2878] Attempt to fix deadlocks that occur when the Editor loads surface tag assets.
I wasn't able to reproduce the deadlock, but from the reported callstack, the following lock inversion happens:
* EditorSurfaceDataSystemComponent::OnCatalogLoaded locked the AssetCatalogRequestBus mutex by calling EnumerateAssets, and then locked m_assetMutex inside GetAsset->FindOrCreateAsset inside the enumerate callback.
* Loading threads would lock m_assetMutex in AssetManager::ValidateAndRegisterAssetLoading, then lock the AssetCatalogRequestBus inside the Asset<T> copy constructor when calling UpdateDebugStatus when the constructor calls SetData->UpgradeAssetInfo->UpdateAssetInfo->AssetCatalogRequestBus::GetAssetInfoById

This should solve the lock inversion on both sides of the problem:
* UpdateDebugStatus now takes in a const ref instead of a copy, so the copy constructor isn't called.
* EditorSurfaceDataSystemComponent::OnCatalogLoaded is rewritten to call GetAsset outside of the enumeration call.

As a bonus, this also removes the blocking load call.  The rest of the code already supports asynchronous refreshes as the list assets are added / modified / removed, so this code was changed to leverage the asynchronous refreshes as well.
2021-04-13 15:38:48 -05:00
nvsickle f6e98d5014 Fix viewport context menu hiding cursor and sometimes popping up repeatedly 2021-04-13 11:08:22 -07:00
greerdv 90e52d69bc fixing bug with subdivision level for runtime asset colliders and adding caching for collider aabbs 2021-04-13 10:50:07 +01:00
jackalbe 63c97d6d3c Merge branch 'main' into sceneapi_script_autotest 2021-04-12 14:27:41 -05:00
jackalbe 77d06ecef7 ATOM-14889: Fix for scriptProcessorRule doesn't save with field empty
* removed the script rule from the Editor, now will only be supported via a script or JSON manual edits
* Mesh Serialization - scriptProcessorRule doesn't save with field empty, but produces no error
* added a test to make sure Script Processor Rule operates with an empty filename

Jira: https://jira.agscollab.com/browse/ATOM-14889
Tests: Launched the Editor to removed the script rule from the Editor
2021-04-12 12:30:30 -05:00
Alex Peterson cd12226849 Merge branch 'main' into github/staging 2021-04-12 08:48:09 -07:00
greerdv 51f1183ff4 making scale gizmo apply uniform scale to transform 2021-04-10 15:58:42 +01:00
alexpete c5b955d281 Integrating github/staging through commit b0dd7ed 2021-04-09 12:03:26 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
Brian Herrera 39f53338bf Merge branch 'main' into LoadPipelineFromGitHub 2021-03-26 17:05:57 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable
This is required to build on linux/mac
2021-03-26 09:26:12 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00