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

Conflicts:
	qcsrc/menu/xonotic/slider_picmip.c

diff --cc 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
@@@ -33,6 -36,6 +33,8 @@@ float texmemsize(float s3tc
  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)