]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
make q3 shader settings work on dedicated servers (dpmeshcollisions for
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 18 Mar 2010 03:45:40 +0000 (03:45 +0000)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Sat, 20 Mar 2010 13:34:45 +0000 (14:34 +0100)
example)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10056 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=20bd5f5185559d8a076ffed26c574b367d6f563a

model_brush.c

index 92293ef52a2572525b468dcf69174f67c7a7f1a4..55bf7050c660a2a2d6a6fe60ab3c7e7daa9bc2aa 100644 (file)
@@ -4281,13 +4281,10 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
                strlcpy (out[i].name, in[i].name, sizeof (out[i].name));
                out[i].surfaceflags = LittleLong(in[i].surfaceflags);
                out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-               if (cls.state != ca_dedicated)
-               {
-                       Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
-                       // restore the surfaceflags and supercontents
-                       out[i].surfaceflags = LittleLong(in[i].surfaceflags);
-                       out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
-               }
+               Mod_LoadTextureFromQ3Shader(out + i, out[i].name, true, true, TEXF_MIPMAP | (r_picmipworld.integer ? TEXF_PICMIP : 0) | TEXF_COMPRESS);
+               // restore the surfaceflags and supercontents
+               out[i].surfaceflags = LittleLong(in[i].surfaceflags);
+               out[i].supercontents = Mod_Q3BSP_SuperContentsFromNativeContents(loadmodel, LittleLong(in[i].contents));
        }
 }