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

updating based on feedback

Browse Source
This commit is contained in:
Gene Walters
2021-04-21 09:46:06 -07:00
parent c30083ca92
commit 1ef7d5c14b
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Assets/ActorAsset.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ namespace EMotionFX
&actorSettings,
"");
assetData->ReleaseEmotionFXData();
assetData->ReleaseEMotionFXData();
if (!assetData->m_emfxActor)
{
Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ namespace EMotionFX
}
}
assetData->ReleaseEmotionFXData();
assetData->ReleaseEMotionFXData();
AZ_Error("EMotionFX", assetData->m_emfxAnimGraph, "Failed to initialize anim graph asset %s", asset.GetHint().c_str());
return static_cast<bool>(assetData->m_emfxAnimGraph);
}
Gems/EMotionFX/Code/Source/Integration/Assets/AssetCommon.h
+2 -3
View File
@@ -36,10 +36,9 @@ namespace EMotionFX
: AZ::Data::AssetData(id)
{}
void ReleaseEmotionFXData()
void ReleaseEMotionFXData()
{
m_emfxNativeData.clear();
m_emfxNativeData.shrink_to_fit();
m_emfxNativeData = {};
}
AZStd::vector<AZ::u8> m_emfxNativeData;
Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ namespace EMotionFX
assetData->m_emfxMotion->SetIsOwnedByRuntime(true);
}
assetData->ReleaseEmotionFXData();
assetData->ReleaseEMotionFXData();
AZ_Error("EMotionFX", assetData->m_emfxMotion, "Failed to initialize motion asset %s", asset.GetHint().c_str());
return (assetData->m_emfxMotion);
}
Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ namespace EMotionFX
// Set motion set's motion load callback, so if EMotion FX queries back for a motion,
// we can pull the one managed through an AZ::Asset.
assetData->m_emfxMotionSet->SetCallback(aznew CustomMotionSetCallback(asset));
assetData->ReleaseEmotionFXData();
assetData->ReleaseEMotionFXData();
return true;
}