From 722622ded16b747d4852512c47536b74049a969e Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 24 Jan 2015 17:50:48 +0100 Subject: [PATCH] Fixed SkeletalModel registering itself for update multiple times Former-commit-id: 9c7ff03a70b65c2ace3b7929b78f486621797dd4 --- src/Nazara/Graphics/SkeletalModel.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Nazara/Graphics/SkeletalModel.cpp b/src/Nazara/Graphics/SkeletalModel.cpp index 958f66ed3..1f9cba729 100644 --- a/src/Nazara/Graphics/SkeletalModel.cpp +++ b/src/Nazara/Graphics/SkeletalModel.cpp @@ -43,7 +43,7 @@ m_nextFrame(model.m_nextFrame) NzSkeletalModel::~NzSkeletalModel() { - Reset(); + m_scene->UnregisterForUpdate(this); } void NzSkeletalModel::AddToRenderQueue(NzAbstractRenderQueue* renderQueue) const @@ -168,9 +168,6 @@ void NzSkeletalModel::Reset() NzModel::Reset(); m_skeleton.Destroy(); - - if (m_scene) - m_scene->UnregisterForUpdate(this); } bool NzSkeletalModel::SetAnimation(NzAnimation* animation) @@ -211,12 +208,7 @@ bool NzSkeletalModel::SetAnimation(NzAnimation* animation) m_interpolation = 0.f; SetSequence(0); - - if (m_scene) - m_scene->RegisterForUpdate(this); } - else if (m_scene) - m_scene->UnregisterForUpdate(this); return true; } @@ -327,8 +319,7 @@ NzSkeletalModel& NzSkeletalModel::operator=(NzSkeletalModel&& node) void NzSkeletalModel::Register() { - if (m_animation) - m_scene->RegisterForUpdate(this); + m_scene->RegisterForUpdate(this); } void NzSkeletalModel::Unregister()