X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rmain.c;h=276a6455021dd00123234bbed1fa4d4c9c5dbbfa;hp=760e60ce4ce36ac7bb596411f14688498a734423;hb=11e05215e5f3cee630f54b9836dab1b36b5b4ffc;hpb=0960c1f25d397c09f680454759f4ea747975c8c9

diff --git a/gl_rmain.c b/gl_rmain.c
index 760e60ce..276a6455 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -105,7 +105,7 @@ cvar_t r_bloom_blur = {CVAR_SAVE, "r_bloom_blur", "8"};
 cvar_t r_bloom_resolution = {CVAR_SAVE, "r_bloom_resolution", "320"};
 cvar_t r_bloom_power = {CVAR_SAVE, "r_bloom_power", "4"};
 
-cvar_t developer_texturelogging = {0, "developer_texturelogging", "1"};
+cvar_t developer_texturelogging = {0, "developer_texturelogging", "0"};
 
 cvar_t gl_lightmaps = {0, "gl_lightmaps", "0"};
 
@@ -473,7 +473,7 @@ void gl_main_newmap(void)
 	if (cl.worldmodel)
 	{
 		strlcpy(entname, cl.worldmodel->name, sizeof(entname));
-		l = strlen(entname) - 4;
+		l = (int)strlen(entname) - 4;
 		if (l >= 0 && !strcmp(entname + l, ".bsp"))
 		{
 			strcpy(entname + l, ".ent");
@@ -579,7 +579,6 @@ void Render_Init(void)
 {
 	gl_backend_init();
 	R_Textures_Init();
-	Mod_RenderInit();
 	R_MeshQueue_Init();
 	GL_Main_Init();
 	GL_Draw_Init();
@@ -593,6 +592,7 @@ void Render_Init(void)
 	UI_Init();
 	Sbar_Init();
 	R_LightningBeams_Init();
+	Mod_RenderInit();
 }
 
 /*
@@ -1482,6 +1482,8 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
 		t->currentmaterialflags |= MATERIALFLAG_ADD | MATERIALFLAG_TRANSPARENT;
 	else if (t->currentalpha < 1)
 		t->currentmaterialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT;
+	if (ent->effects & EF_NODEPTHTEST)
+		t->currentmaterialflags |= MATERIALFLAG_NODEPTHTEST;
 }
 
 void R_UpdateAllTextureInfo(entity_render_t *ent)
@@ -2339,7 +2341,7 @@ void R_QueueTextureSurfaceList(entity_render_t *ent, texture_t *texture, int tex
 				tempcenter[1] = (surface->mins[1] + surface->maxs[1]) * 0.5f;
 				tempcenter[2] = (surface->mins[2] + surface->maxs[2]) * 0.5f;
 				Matrix4x4_Transform(&ent->matrix, tempcenter, center);
-				R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : center, RSurfShader_Transparent_Callback, ent, surface - ent->model->data_surfaces);
+				R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, RSurfShader_Transparent_Callback, ent, surface - ent->model->data_surfaces);
 			}
 		}
 	}