From: havoc havoc@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Wed, 14 Jul 2010 10:12:46 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~185
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95e4f4f6007f4f5c33aebeb6bed8a4edc13e86ce;p=xonotic%2Fdarkplaces.git

UNMERGE
fix a warning in mingw
changed a model->brush.data_nodes check to data_leafs instead

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10320 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=102c27e9f7f292ff2ae0dfe9d80e20335be10906
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 035ca0c5..5ca0e029 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4701,9 +4701,7 @@ static char *R_HLSL_GetText(const char *filename, qboolean printfromdisknotice)
 
 #include <d3dx9.h>
 #include <d3dx9mesh.h>
-#ifdef _MSC_VER
 #pragma comment(lib, "d3dx9.lib")
-#endif
 
 static void R_HLSL_CacheShader(r_hlsl_permutation_t *p, const char *cachename, const char *vertstring, const char *fragstring)
 {
@@ -8884,11 +8882,6 @@ void R_Bloom_StartFrame(void)
 
 	switch(vid.renderpath)
 	{
-	case RENDERPATH_GL11:
-	case RENDERPATH_GL13:
-	case RENDERPATH_GL20:
-	case RENDERPATH_CGGL:
-		break;
 	case RENDERPATH_D3D9:
 	case RENDERPATH_D3D10:
 	case RENDERPATH_D3D11:
@@ -13402,7 +13395,7 @@ static void R_DecalSystem_SplatEntity(entity_render_t *ent, const vec3_t worldor
 		return;
 	}
 
-	if (!model->brush.data_leafs && !cl_decals_models.integer)
+	if (!model->brush.data_nodes && !cl_decals_models.integer)
 	{
 		if (decalsystem->model)
 			R_DecalSystem_Reset(decalsystem);