Whoops forgot the file itself :P

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / slider_picmip.c

diff --git a/qcsrc/menu/xonotic/slider_picmip.c b/qcsrc/menu/xonotic/slider_picmip.c
index cf1d9d20a7870c5e7d613aca8362faaee5531ad8..ddedc4bab2901e2cd077a60c475aef525f223e80 100644 (file)
--- a/qcsrc/menu/xonotic/slider_picmip.c
+++ b/qcsrc/menu/xonotic/slider_picmip.c
@@ -28,11 +28,13 @@ float texmemsize(float s3tc)
        (
                  2500 * pow(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
                + 1500 * pow(0.25, max(0, cvar("gl_picmip") + cvar("gl_picmip_world")))
-       ) * (s3tc && ((cvar("r_texture_dds_load") || cvar("gl_texturecompression")) ? 0.2 : 1.0)); // TC: normalmaps 50%, other 25%, few incompressible, guessing 40% as conservative average
+       ) * ((s3tc && (cvar("r_texture_dds_load") || cvar("gl_texturecompression"))) ? 0.2 : 1.0); // TC: normalmaps 50%, other 25%, few incompressible, guessing 40% as conservative average
 }
 void XonoticPicmipSlider_autofix(entity me)
 {
        float max_hard, max_soft;
+       if(cvar("menu_picmip_bypass"))
+               return;
        max_hard = cvar("sys_memsize_virtual");
        max_soft = cvar("sys_memsize_physical");
        if(max_hard > 0)