From bc6d7fbb8cac512e5fe20e21cd941ed602935bab Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Fri, 7 Dec 2012 21:24:45 +0100 Subject: [PATCH] Fixed wrong assert --- neo/idlib/sys/sys_assert.cpp | 2 +- neo/renderer/tr_frontend_addmodels.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/neo/idlib/sys/sys_assert.cpp b/neo/idlib/sys/sys_assert.cpp index ee230231..43458b52 100644 --- a/neo/idlib/sys/sys_assert.cpp +++ b/neo/idlib/sys/sys_assert.cpp @@ -91,7 +91,7 @@ bool AssertFailed( const char* file, int line, const char* expression ) // RB end { #ifdef _WIN32 -#ifdef _MSC_VERS +#ifdef _MSC_VER __debugbreak(); #else // DG: mingw support diff --git a/neo/renderer/tr_frontend_addmodels.cpp b/neo/renderer/tr_frontend_addmodels.cpp index b71ee240..ea19404f 100644 --- a/neo/renderer/tr_frontend_addmodels.cpp +++ b/neo/renderer/tr_frontend_addmodels.cpp @@ -686,7 +686,10 @@ void R_AddSingleModel( viewEntity_t* vEntity ) { assert( tri->staticModelWithJoints == NULL ); R_DeriveTangents( tri ); - assert( false ); // this should no longer be hit + + // RB: this was hit by parametric particle models .. + //assert( false ); // this should no longer be hit + // RB end } tri->ambientCache = vertexCache.AllocVertex( tri->verts, ALIGN( tri->numVerts * sizeof( idDrawVert ), VERTEX_CACHE_ALIGN ) ); }