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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 03a31b899c21428220ce10ff9c481b913629760f..ea06430d3d686201fc76fa10c5ba65658b9207d7 100644 (file)
--- 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 f4dd6b9807864b0411c8e3d0b1aa74175c4d8675..f0ab9f438f571ab4d55ecc48f143533361f73992 100644 (file)
--- 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");