From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 26 Oct 2011 14:25:26 +0000 (+0300)
Subject: Add the no material setting to the menu, but don't default it
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~144
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=418d48558189409335d767daaa8c45bbbc803aa4;p=xonotic%2Fxonotic-data.pk3dir.git

Add the no material setting to the menu, but don't default it
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 03a31b899..ea06430d3 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -557,7 +557,7 @@ seta menu_sandbox_edit_frame 0
 seta menu_sandbox_edit_scale 1
 seta menu_sandbox_edit_physics 1
 seta menu_sandbox_edit_force 1
-seta menu_sandbox_edit_material 0
+seta menu_sandbox_edit_material 1
 
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 bind f7 menu_showsandboxtools
diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c
index f4dd6b980..f0ab9f438 100644
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.c
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c
@@ -49,6 +49,7 @@ void XonoticSandboxToolsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set material:"), '0 0 0', "sandbox edit_object material $menu_sandbox_edit_material", 0));
 		me.TD(me, 1, 1.5, e = makeXonoticTextSlider("menu_sandbox_edit_material"));
+			e.addValue(e, _("none"), "0");
 			e.addValue(e, _("metal"), "1");
 			e.addValue(e, _("stone"), "2");
 			e.addValue(e, _("wood"), "3");