From f3603a0b3111dae18d0946938b4b5306b3f0079c Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 25 Jun 2013 14:50:38 +0200 Subject: [PATCH] Fixed model using last mesh materials for new mesh Former-commit-id: 91bd231b45b701b18d6e86eab74afbd141a51ded --- src/Nazara/Graphics/Model.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Nazara/Graphics/Model.cpp b/src/Nazara/Graphics/Model.cpp index c50b6bf33..b7d642463 100644 --- a/src/Nazara/Graphics/Model.cpp +++ b/src/Nazara/Graphics/Model.cpp @@ -490,6 +490,7 @@ void NzModel::SetMesh(NzMesh* mesh) } m_matCount = mesh->GetMaterialCount(); + m_materials.clear(); m_materials.resize(m_matCount, NzMaterial::GetDefault()); m_skinCount = 1; } @@ -498,8 +499,8 @@ void NzModel::SetMesh(NzMesh* mesh) m_boundingVolume.MakeNull(); m_boundingVolumeUpdated = true; m_matCount = 0; - m_skinCount = 0; m_materials.clear(); + m_skinCount = 0; SetAnimation(nullptr); }