From 807e2de3f4cc150eabff71b55495da3b94686532 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 24 Apr 2009 21:43:48 +0000 Subject: [PATCH] Adding some additional check to avoid viewer crashes when the user changes the asset too fast. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@404 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- tools/assimp_view/MeshRenderer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/assimp_view/MeshRenderer.cpp b/tools/assimp_view/MeshRenderer.cpp index 0efcf8a20..9c81d3ad9 100644 --- a/tools/assimp_view/MeshRenderer.cpp +++ b/tools/assimp_view/MeshRenderer.cpp @@ -85,6 +85,9 @@ int CMeshRenderer::DrawSorted(unsigned int iIndex,const aiMatrix4x4& mWorld) AssetHelper::MeshHelper* pcHelper = g_pcAsset->apcMeshes[iIndex]; const aiMesh* pcMesh = g_pcAsset->pcScene->mMeshes[iIndex]; + if (!pcHelper || !pcMesh || !pcHelper->piIB) + return -5; + if (pcMesh->mPrimitiveTypes != aiPrimitiveType_TRIANGLE) return DrawUnsorted(iIndex); if (pcMesh->HasBones())