]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix a warning in mingw
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 14 Jul 2010 10:12:46 +0000 (10:12 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 14 Jul 2010 10:12:46 +0000 (10:12 +0000)
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

gl_rmain.c

index d50e9c50bd1958eb1bae88c47ba31e301eb15eb8..4628d60c40287c3d0b86ca7b101c927f0c6f48a7 100644 (file)
@@ -4701,7 +4701,9 @@ 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)
 {
@@ -8768,6 +8770,11 @@ 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:
@@ -13278,7 +13285,7 @@ static void R_DecalSystem_SplatEntity(entity_render_t *ent, const vec3_t worldor
                return;
        }
 
-       if (!model->brush.data_nodes && !cl_decals_models.integer)
+       if (!model->brush.data_leafs && !cl_decals_models.integer)
        {
                if (decalsystem->model)
                        R_DecalSystem_Reset(decalsystem);