BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Renderer trying to play animations when there is no animation component

Browse Source
This commit is contained in:
sippeangelo
2015-10-21 15:35:57 +02:00
parent 9b8546abb2
commit 2df78e011a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Core/Engine.h
+4 -6
View File
@@ -361,13 +361,11 @@ public:
job.ModelMatrix = modelMatrix * model->m_Matrix; job.ModelMatrix = modelMatrix * model->m_Matrix;
job.Color = modelComponent->Color; job.Color = modelComponent->Color;
if (model->m_Skeleton != nullptr) { if (model->m_Skeleton != nullptr && animationComponent != nullptr) {
job.Skeleton = model->m_Skeleton; job.Skeleton = model->m_Skeleton;
if (animationComponent != nullptr) { job.AnimationName = animationComponent->Name;
job.AnimationName = animationComponent->Name; job.AnimationTime = animationComponent->Time;
job.AnimationTime = animationComponent->Time; job.NoRootMotion = animationComponent->NoRootMotion;
job.NoRootMotion = animationComponent->NoRootMotion;
}
} }
m_RendererQueue.Deferred.Add(job); m_RendererQueue.Deferred.Add(job);