GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'anim-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-anim-fix

Browse Source
This commit is contained in:
Wojtek Figat
2023-10-12 12:12:01 +02:00
parent b1ad2c3a02 28d6fe84ef
commit 0280fa4f9b
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Engine/Animations/Graph/AnimGroup.Animation.cpp
View File

@@ -764,14 +764,17 @@ void AnimGraphExecutor::ProcessGroupAnimation(Box* boxBase, Node* nodeBase, Valu
const float startTimePos = (float)tryGetValue(node->GetBox(7), node->Values[3]);
// Override animation when animation reference box is connected
auto animationAssetBox = node->GetBox(8);
if (animationAssetBox->HasConnection())
auto animationAssetBox = node->TryGetBox(8);
if (animationAssetBox)
{
const Value assetBoxValue = tryGetValue(animationAssetBox, Value::Null);
if (assetBoxValue != Value::Null)
anim = (Animation*)assetBoxValue.AsAsset;
else
anim = nullptr;
if (animationAssetBox->HasConnection())
{
const Value assetBoxValue = tryGetValue(animationAssetBox, Value::Null);
if (assetBoxValue != Value::Null)
anim = (Animation*)assetBoxValue.AsAsset;
else
anim = nullptr;
}
}
const float length = anim ? anim->GetLength() : 0.0f;