X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_rmain.c;h=f9bc7499d8a2eca54914a06de4efc1c1a81f213c;hb=1a711173535d4b5f4364b66177745aab165330d8;hp=6b37179ea9134dcb790596e71f9e9212fd6eec55;hpb=8aff8447d3f2c263e62ffe63f04f4c8b08f54541;p=xonotic%2Fdarkplaces.git

diff --git a/gl_rmain.c b/gl_rmain.c
index 6b37179e..f9bc7499 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -247,6 +247,7 @@ cvar_t r_glsl_saturation_redcompensate = {CF_CLIENT | CF_ARCHIVE, "r_glsl_satura
 
 cvar_t r_glsl_vertextextureblend_usebothalphas = {CF_CLIENT | CF_ARCHIVE, "r_glsl_vertextextureblend_usebothalphas", "0", "use both alpha layers on vertex blended surfaces, each alpha layer sets amount of 'blend leak' on another layer, requires mod_q3shader_force_terrain_alphaflag on."};
 
+// FIXME: This cvar would grow to a ridiculous size after several launches and clean exits when used during surface sorting.
 cvar_t r_framedatasize = {CF_CLIENT | CF_ARCHIVE, "r_framedatasize", "0.5", "size of renderer data cache used during one frame (for skeletal animation caching, light processing, etc)"};
 cvar_t r_buffermegs[R_BUFFERDATA_COUNT] =
 {
@@ -3197,7 +3198,7 @@ static void gl_main_shutdown(void)
 	r_texture_numcubemaps = 0;
 	//r_texture_fogintensity = NULL;
 	memset(&r_fb, 0, sizeof(r_fb));
-	R_GLSL_Restart_f(cmd_client);
+	R_GLSL_Restart_f(cmd_local);
 
 	r_glsl_permutation = NULL;
 	memset(r_glsl_permutationhash, 0, sizeof(r_glsl_permutationhash));
@@ -3446,6 +3447,7 @@ void Render_Init(void)
 	R_Particles_Init();
 	R_Explosion_Init();
 	R_LightningBeams_Init();
+	CL_MeshEntities_Init();
 	Mod_RenderInit();
 }
 
@@ -5632,7 +5634,7 @@ void R_RenderView(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture, i
 	rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity
 
 	if(R_CompileShader_CheckStaticParms())
-		R_GLSL_Restart_f(cmd_client);
+		R_GLSL_Restart_f(cmd_local);
 
 	if (!r_drawentities.integer)
 		r_refdef.scene.numentities = 0;
@@ -6123,7 +6125,7 @@ static void R_DrawEntityBBoxes(prvm_prog_t *prog)
 	for (i = 0; i < prog->num_edicts; i++)
 	{
 		edict = PRVM_EDICT_NUM(i);
-		if (edict->priv.server->free)
+		if (edict->free)
 			continue;
 		// exclude the following for now, as they don't live in world coordinate space and can't be solid:
 		if (PRVM_gameedictedict(edict, tag_entity) != 0)