more thorough checking of 'this should never happen' cases

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1381 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_decals.c b/cl_decals.c
index 9fe650e950b8bd0852d16c767771e794c43b77c2..5bea3dec6ae0bbbd40b6834a69dd65828ee0e42c 100644 (file)
--- a/cl_decals.c
+++ b/cl_decals.c
@@ -225,7 +225,7 @@ void CL_UpdateDecals (void)
                if (p->tex == 0)
                        continue;
 
-               if (p->ent && p->ent->visframe == r_framecount && p->ent->model != p->model)
+               if (p->ent && p->ent->visframe == r_framecount && (p->ent->model != p->model || p->ent->model->type != mod_brush))
                {
                        p->tex = 0;
                        continue;

diff --git a/r_decals.c b/r_decals.c
index 07a350fc50f1c3af1938fd171b657fd881b3a520..05861c1770804157af32c1c2a5d5972ccb42f1c5 100644 (file)
--- a/r_decals.c
+++ b/r_decals.c
@@ -85,6 +85,8 @@ void R_DrawDecals (void)
                                continue;
 
                        Mod_CheckLoaded(r->ent->model);
+                       if (r->ent->model->type != mod_brush)
+                               continue;
 
                        surf = r->ent->model->surfaces + r->surface;