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

Fix Mac Editor crash when adding PhysX Collider component to an entity. (#1930)

Browse Source 
Signed-off-by: amzn-sj <srikkant@amazon.com>
This commit is contained in:
SJ
2021-07-07 16:17:40 -07:00
committed by GitHub
parent b9964bbb5a
commit 9ca7a698df
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Physics/Material.cpp
+2 -2
View File
@@ -504,7 +504,7 @@ namespace Physics
}
}
const AZ::Data::Asset<Physics::MaterialLibraryAsset>& MaterialSelection::GetMaterialLibrary()
AZ::Data::Asset<Physics::MaterialLibraryAsset> MaterialSelection::GetMaterialLibrary()
{
if (auto* physicsSystem = AZ::Interface<AzPhysics::SystemInterface>::Get())
{
@@ -516,7 +516,7 @@ namespace Physics
return s_invalidMaterialLibrary;
}
const AZ::Data::AssetId& MaterialSelection::GetMaterialLibraryId()
AZ::Data::AssetId MaterialSelection::GetMaterialLibraryId()
{
return GetMaterialLibrary().GetId();
}
Code/Framework/AzFramework/AzFramework/Physics/Material.h
+2 -2
View File
@@ -306,8 +306,8 @@ namespace Physics
void SyncSelectionToMaterialLibrary();
static const AZ::Data::Asset<Physics::MaterialLibraryAsset>& GetMaterialLibrary();
static const AZ::Data::AssetId& GetMaterialLibraryId();
static AZ::Data::Asset<Physics::MaterialLibraryAsset> GetMaterialLibrary();
static AZ::Data::AssetId GetMaterialLibraryId();
bool AreMaterialSlotsReadOnly() const;