From be70e48118f48a7a26d211f8691e38c537688b64 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 4 Jan 2013 02:36:03 +0100 Subject: [PATCH] Fixed Model::SetMesh bug with static meshs Former-commit-id: 5fcccf6ac485528bcdd4f1250a2ba948a50ca456 --- src/Nazara/3D/Model.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nazara/3D/Model.cpp b/src/Nazara/3D/Model.cpp index 6cb84fad6..21640e767 100644 --- a/src/Nazara/3D/Model.cpp +++ b/src/Nazara/3D/Model.cpp @@ -303,7 +303,7 @@ void NzModel::SetMesh(const NzMesh* mesh, const NzModelParameters& modelParamete if (m_mesh->GetAnimationType() == nzAnimationType_Skeletal) m_skeleton = *mesh->GetSkeleton(); // Copie du squelette template - if (modelParameters.loadAnimation) + if (modelParameters.loadAnimation && m_mesh->IsAnimable()) { NzString animationPath = m_mesh->GetAnimation(); if (!animationPath.IsEmpty())