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

Conflicts:
	qcsrc/menu/xonotic/slider_picmip.c

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 08e26c6fa57aea25e54d1246db9054a31681a487..72f43f6fd453e639938bd07b5420eb782d39725e 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1361,6 +1361,7 @@ seta slowmo 1
 seta menu_skin "luminos"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
+set menu_picmip_bypass 0 "bypass texture quality enforcement based on system resources, not recommended and may cause crashes!"
 
 r_textbrightness 0.2
 r_textcontrast 0.8

diff --git a/qcsrc/menu/xonotic/slider_picmip.c b/qcsrc/menu/xonotic/slider_picmip.c
index 2222413e3f3a404c7e80c39383b6bd29631c0a63..ddedc4bab2901e2cd077a60c475aef525f223e80 100644 (file)
--- a/qcsrc/menu/xonotic/slider_picmip.c
+++ b/qcsrc/menu/xonotic/slider_picmip.c
@@ -33,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)