From: Mario <mario.mario@y7mail.com>
Date: Wed, 15 Jul 2020 18:14:58 +0000 (+1000)
Subject: Don't display VBO options in the menu if the gl_vbo setting doesn't exist in the... 
X-Git-Tag: xonotic-v0.8.5~867
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c92b8dc9641b4c7b099dcbc1c1bd50758779d67c;p=xonotic%2Fxonotic-data.pk3dir.git

Don't display VBO options in the menu if the gl_vbo setting doesn't exist in the engine
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qc b/qcsrc/menu/xonotic/dialog_settings_video.qc
index 849fa435b..c43e0af99 100644
--- a/qcsrc/menu/xonotic/dialog_settings_video.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qc
@@ -102,6 +102,8 @@ void XonoticVideoSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("DF^All")), "2");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
+	if(cvar_type("gl_vbo") & CVAR_TYPEFLAG_ENGINE)
+	{
 		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Vertex Buffer Objects (VBOs)")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -114,6 +116,7 @@ void XonoticVideoSettingsTab_fill(entity me)
 			_("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
 		me.TD(me, 1, 1.9, e = makeXonoticRadioButton_T(1, "gl_vbo", "1", _("Vertices and Triangles"),
 			_("Make use of Vertex Buffer Objects to store static geometry in video memory for faster rendering")));
+	}
 
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Brightness:")));
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index e3e523bd9..cab4d561f 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -303,6 +303,7 @@ seta cl_projectiles_sloppy 1 "sloppy projectiles, may temporarily penetrate wall
 cl_stainmaps 0
 cl_particles_smoke 1
 set vid_gl20 1
+set gl_vbo 3
 r_glsl_deluxemapping 1
 r_glsl_offsetmapping 0
 r_glsl_offsetmapping_lod 1