Merge remote branch 'origin/mirceakitsune/menu_bypass-picmip-check'

Conflicts:
	qcsrc/menu/xonotic/slider_picmip.c

diff --combined qcsrc/menu/xonotic/slider_picmip.c
index 2222413e3f3a404c7e80c39383b6bd29631c0a63,2325e5fde3efa5aeb1f56f5786d8887d4eeb1cdc..ddedc4bab2901e2cd077a60c475aef525f223e80
--- 1/qcsrc/menu/xonotic/slider_picmip.c
--- 2/qcsrc/menu/xonotic/slider_picmip.c
+++ b/qcsrc/menu/xonotic/slider_picmip.c
@@@ -24,15 -24,18 +24,17 @@@ void XonoticPicmipSlider_configureXonot
  }
  float texmemsize(float s3tc)
  {
 -      if(cvar("menu_picmip_bypass"))
 -              return 0;
 -      else
 -              return
 -              (
 -                        2500 * pow(0.5, max(0, cvar("gl_picmip") + cvar("gl_picmip_other")))
 -                      + 1500 * pow(0.5, 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
 +      return
 +      (
 +                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
  }
  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)