From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 8 Jan 2011 18:14:35 +0000 (+0100)
Subject: Merge remote branch 'origin/mirceakitsune/menu_bypass-picmip-check'
X-Git-Tag: xonotic-v0.5.0~109^2~26^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=000100e5a06711f313310a4c35468e00c222eb4e;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/menu/xonotic/slider_picmip.c
---

000100e5a06711f313310a4c35468e00c222eb4e
diff --cc qcsrc/menu/xonotic/slider_picmip.c
index 2222413e3,2325e5fde..ddedc4bab
--- a/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)