X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fslider_picmip.c;h=ddedc4bab2901e2cd077a60c475aef525f223e80;hb=e3c57d4e706a9ee1342e25a178955162f4f5925f;hp=af278dfd1f776da754fb952689a7a262c47ec90f;hpb=2a9df1dc726597e8943be9ef956620c36693d219;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/slider_picmip.c b/qcsrc/menu/xonotic/slider_picmip.c
index af278dfd1..ddedc4bab 100644
--- a/qcsrc/menu/xonotic/slider_picmip.c
+++ b/qcsrc/menu/xonotic/slider_picmip.c
@@ -26,13 +26,15 @@ float texmemsize(float s3tc)
 {
 	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
+		  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)