From 0a52bd4800459cd9935f360d7ca9555b6bea2146 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Fri, 19 Jul 2019 20:56:44 -0400 Subject: [PATCH] CSG + paint mode. --- ObjEditor.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ObjEditor.java b/ObjEditor.java index 30d64e6..f3f020f 100644 --- a/ObjEditor.java +++ b/ObjEditor.java @@ -327,8 +327,8 @@ if (copy.versions == null) { - copy.versions = new byte[100][]; - copy.versionindex = -1; +// copy.versions = new byte[100][]; +// copy.versionindex = -1; } SetupMenu(); @@ -974,7 +974,7 @@ // NumberSlider vDivsField; // JCheckBox endcaps; JCheckBox liveCB; - JCheckBox selectCB; + JCheckBox selectableCB; JCheckBox hideCB; JCheckBox link2masterCB; JCheckBox markCB; @@ -1186,9 +1186,10 @@ liveCB = AddCheckBox(setupPanel, "Live", copy.live); liveCB.setToolTipText("Animate object"); - selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect); - selectCB.setToolTipText("Make object selectable"); + selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect); + selectableCB.setToolTipText("Make object selectable"); // Return(); + hideCB = AddCheckBox(setupPanel, "Hide", copy.hide); hideCB.setToolTipText("Hide object"); markCB = AddCheckBox(setupPanel, "Mark", copy.marked); @@ -3250,7 +3251,7 @@ { copy.live ^= true; return; - } else if (event.getSource() == selectCB) + } else if (event.getSource() == selectableCB) { copy.dontselect ^= true; return; -- Gitblit v1.6.2