]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix r_drawviewmodel
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 30 Jan 2010 23:26:56 +0000 (23:26 +0000)
committerRudolf Polzer <divVerent@alientrap.org>
Mon, 1 Feb 2010 07:17:29 +0000 (08:17 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9894 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=b8be74b1802b422cc09c8dc11d5da9b17d22f2ad

gl_rmain.c

index fb6cf46e2c0d0695bcd0f1329fa1abef65f1598b..772775168933cd2da27fb6dc7bfa071727a109de 100644 (file)
@@ -6712,6 +6712,7 @@ static void R_View_UpdateEntityVisible (void)
                        if (!(ent->flags & renderimask))
                        if (!R_CullBox(ent->mins, ent->maxs) || (ent->model->type == mod_sprite && (ent->model->sprite.sprnum_type == SPR_LABEL || ent->model->sprite.sprnum_type == SPR_LABEL_SCALE)))
                        if ((ent->flags & (RENDER_NODEPTHTEST | RENDER_VIEWMODEL)) || r_refdef.scene.worldmodel->brush.BoxTouchingVisibleLeafs(r_refdef.scene.worldmodel, r_refdef.viewcache.world_leafvisible, ent->mins, ent->maxs))
+                       if (!(ent->flags & (RENDER_VIEWMODEL)) || r_drawviewmodel.integer)
                                r_refdef.viewcache.entityvisible[i] = true;
                }
                if(r_cullentities_trace.integer && r_refdef.scene.worldmodel->brush.TraceLineOfSight)