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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-01 11:55:44 +02:00
parent 772172ed6b 6877e14b04
commit 8a942922fe
10 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Engine/Level/Actors/AnimatedModel.cpp
View File

@@ -2,7 +2,7 @@
#include "AnimatedModel.h"
#include "BoneSocket.h"
#include "Engine/Animations/AnimationManager.h"
#include "Engine/Animations/Animations.h"
#include "Engine/Engine/Engine.h"
#if USE_EDITOR
#include "Editor/Editor.h"
@@ -52,7 +52,7 @@ void AnimatedModel::UpdateAnimation()
if (AnimationGraph && AnimationGraph->IsLoaded() && AnimationGraph->Graph.IsReady())
{
// Request an animation update
AnimationManager::AddToUpdate(this);
Animations::AddToUpdate(this);
}
else
{
@@ -389,7 +389,7 @@ void AnimatedModel::BeginPlay(SceneBeginData* data)
void AnimatedModel::EndPlay()
{
AnimationManager::RemoveFromUpdate(this);
Animations::RemoveFromUpdate(this);
SetMasterPoseModel(nullptr);
// Base