.. | .. |
---|
60 | 60 | this.copy = this.group = group; |
---|
61 | 61 | //selectees = this.group.selectees; |
---|
62 | 62 | |
---|
| 63 | + if (copy.versions == null) |
---|
| 64 | + { |
---|
| 65 | + copy.versions = new byte[100][]; |
---|
| 66 | + copy.versionindex = -1; |
---|
| 67 | + } |
---|
| 68 | + |
---|
63 | 69 | if(ui) |
---|
64 | 70 | SetupUI(objEditor); |
---|
65 | 71 | } |
---|
.. | .. |
---|
80 | 86 | SetupViews(objEditor); |
---|
81 | 87 | |
---|
82 | 88 | ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true); |
---|
| 89 | + |
---|
| 90 | + if (copy.versions == null) |
---|
| 91 | + { |
---|
| 92 | + copy.versions = new byte[100][]; |
---|
| 93 | + copy.versionindex = -1; |
---|
| 94 | + |
---|
| 95 | + Save(true); |
---|
| 96 | + } |
---|
83 | 97 | } |
---|
84 | 98 | |
---|
85 | 99 | void CloneSelection(boolean supports) |
---|
86 | 100 | { |
---|
87 | | - if (Globals.SAVEONMAKE) |
---|
| 101 | + if (Globals.REPLACEONMAKE) |
---|
88 | 102 | Save(); |
---|
89 | | - boolean keep = Globals.SAVEONMAKE; |
---|
90 | | - Globals.SAVEONMAKE = false; |
---|
| 103 | + boolean keep = Globals.REPLACEONMAKE; |
---|
| 104 | + Globals.REPLACEONMAKE = false; |
---|
91 | 105 | // Object3D keep = GrafreeD.clipboard; |
---|
92 | 106 | //Object3D obj; |
---|
93 | 107 | for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();) |
---|
.. | .. |
---|
98 | 112 | |
---|
99 | 113 | makeSomething(clone, i==group.selection.size()-1); |
---|
100 | 114 | } |
---|
101 | | - Globals.SAVEONMAKE = keep; |
---|
| 115 | + Globals.REPLACEONMAKE = keep; |
---|
102 | 116 | } |
---|
103 | 117 | |
---|
104 | 118 | void CloneClipboard(boolean supports) |
---|
.. | .. |
---|
194 | 208 | // pasteExpandItem = menu.add(new MenuItem("Paste expand")); |
---|
195 | 209 | // pasteExpandItem.addActionListener(this); |
---|
196 | 210 | menu.add("-"); |
---|
197 | | - clearItem = menu.add(new MenuItem("Clear")); |
---|
198 | | - clearItem.addActionListener(this); |
---|
| 211 | + deleteItem = menu.add(new MenuItem("Delete")); |
---|
| 212 | + deleteItem.addActionListener(this); |
---|
199 | 213 | |
---|
200 | 214 | if (Globals.ADVANCED) |
---|
201 | 215 | { |
---|
.. | .. |
---|
421 | 435 | genNormalsMESHItem.addActionListener(this); |
---|
422 | 436 | if (Globals.ADVANCED) |
---|
423 | 437 | { |
---|
424 | | - genNormalsMINEItem = menu.add(new MenuItem("My Normals")); |
---|
| 438 | + genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals")); |
---|
425 | 439 | genNormalsMINEItem.addActionListener(this); |
---|
426 | 440 | } |
---|
427 | 441 | stripifyItem = menu.add(new MenuItem("Stripify")); |
---|
.. | .. |
---|
544 | 558 | buildToolsMenu(menu); |
---|
545 | 559 | } |
---|
546 | 560 | |
---|
| 561 | + |
---|
547 | 562 | void SetupUI2(ObjEditor oe) |
---|
548 | 563 | { |
---|
549 | 564 | // June 2019 |
---|
.. | .. |
---|
615 | 630 | restoreCameraButton.setToolTipText("Restore viewpoint"); |
---|
616 | 631 | restoreCameraButton.addActionListener(this); |
---|
617 | 632 | |
---|
| 633 | + copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 634 | + saveButton.setToolTipText("New version"); |
---|
| 635 | + saveButton.addActionListener(this); |
---|
| 636 | + |
---|
618 | 637 | copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
619 | | - undoButton.setToolTipText("Undo changes"); |
---|
| 638 | + undoButton.setToolTipText("Previous version"); |
---|
620 | 639 | undoButton.addActionListener(this); |
---|
621 | 640 | undoButton.setEnabled(false); |
---|
622 | 641 | |
---|
| 642 | + cGridBag updown = new cGridBag().setVertical(true); |
---|
| 643 | + updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 644 | + restoreButton.setToolTipText("Restore current"); |
---|
| 645 | + restoreButton.addActionListener(this); |
---|
| 646 | + restoreButton.setEnabled(false); |
---|
| 647 | + |
---|
| 648 | + updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 649 | + replaceButton.setToolTipText("Replace current"); |
---|
| 650 | + replaceButton.addActionListener(this); |
---|
| 651 | + replaceButton.setEnabled(false); |
---|
| 652 | + |
---|
| 653 | + copyOptionsPanel.add(updown); |
---|
| 654 | + |
---|
623 | 655 | copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
624 | | - redoButton.setToolTipText("Redo changes"); |
---|
| 656 | + redoButton.setToolTipText("Next version"); |
---|
625 | 657 | redoButton.addActionListener(this); |
---|
626 | 658 | redoButton.setEnabled(false); |
---|
627 | 659 | |
---|
628 | | - copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
629 | | - saveButton.setToolTipText("Save changes"); |
---|
630 | | - saveButton.addActionListener(this); |
---|
631 | | - |
---|
632 | | - copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints); |
---|
| 660 | + oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints); |
---|
633 | 661 | liveCB.setToolTipText("Enable animation"); |
---|
634 | 662 | liveCB.addItemListener(this); |
---|
635 | 663 | |
---|
636 | | - copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 664 | + oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
637 | 665 | oneStepButton.setToolTipText("Animate one step forward"); |
---|
638 | 666 | oneStepButton.addActionListener(this); |
---|
639 | 667 | |
---|
640 | | - copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints); |
---|
| 668 | + oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints); |
---|
641 | 669 | fastCB.setToolTipText("Fast mode"); |
---|
642 | 670 | fastCB.addItemListener(this); |
---|
643 | 671 | |
---|
.. | .. |
---|
659 | 687 | |
---|
660 | 688 | //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL)); |
---|
661 | 689 | |
---|
662 | | - oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
663 | | - twoButton.setToolTipText("Show center view only"); |
---|
664 | | - twoButton.addActionListener(this); |
---|
665 | | - this.fullscreenLayout = twoButton; |
---|
666 | | - |
---|
667 | 690 | oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
668 | 691 | fourButton.addActionListener(this); |
---|
669 | 692 | fourButton.setToolTipText("Show left panel only"); |
---|
| 693 | + |
---|
| 694 | + oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 695 | + twoButton.setToolTipText("Show right view only"); |
---|
| 696 | + twoButton.addActionListener(this); |
---|
| 697 | + this.fullscreenLayout = twoButton; |
---|
| 698 | + |
---|
670 | 699 | oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
671 | | - sixButton.setToolTipText("2-column layout left"); |
---|
| 700 | + sixButton.setToolTipText("Show left and right"); |
---|
672 | 701 | sixButton.addActionListener(this); |
---|
673 | | - oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
674 | | - threeButton.setToolTipText("2-column layout right"); |
---|
675 | | - threeButton.addActionListener(this); |
---|
676 | | - oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
677 | | - sevenButton.setToolTipText("3-column layout"); |
---|
678 | | - sevenButton.addActionListener(this); |
---|
| 702 | +// oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 703 | +// threeButton.setToolTipText("2-column layout right"); |
---|
| 704 | +// threeButton.addActionListener(this); |
---|
| 705 | +// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 706 | +// sevenButton.setToolTipText("3-column layout"); |
---|
| 707 | +// sevenButton.addActionListener(this); |
---|
679 | 708 | // |
---|
680 | 709 | |
---|
681 | | - oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
682 | | - rootButton.setToolTipText("Edit selection in new tab"); |
---|
| 710 | + oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
| 711 | + rootButton.setToolTipText("Open selection in new tab"); |
---|
683 | 712 | rootButton.addActionListener(this); |
---|
684 | 713 | |
---|
685 | 714 | oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints); |
---|
.. | .. |
---|
820 | 849 | |
---|
821 | 850 | oe.treePanel.add(copyOptionsPanel); |
---|
822 | 851 | oe.treePanel.Return(); |
---|
| 852 | + cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0); |
---|
| 853 | + versionSlider = (cNumberSlider)sliderPane.getComponent(1); |
---|
| 854 | + sliderPane.preferredHeight = 1; |
---|
823 | 855 | |
---|
824 | 856 | // mainPanel.setDividerLocation(0.5); //1.0); |
---|
825 | 857 | // mainPanel.setResizeWeight(0.5); |
---|
.. | .. |
---|
842 | 874 | dgr.addDragGestureListener(this); |
---|
843 | 875 | }catch(Exception e) {} |
---|
844 | 876 | */ |
---|
845 | | - radio.layout = sevenButton; |
---|
| 877 | + radio.layout = sixButton; // sevenButton; |
---|
846 | 878 | oe.toolbarPanel.add(radioPanel); //, oe.aConstraints); |
---|
847 | 879 | } |
---|
848 | 880 | |
---|
.. | .. |
---|
945 | 977 | toggleSwitchCB.setToolTipText("Choose a single item"); |
---|
946 | 978 | toggleSwitchCB.addItemListener(this); |
---|
947 | 979 | |
---|
948 | | - panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints); |
---|
949 | | - autosaveCB.setToolTipText("On structure change"); |
---|
950 | | - autosaveCB.addItemListener(this); |
---|
| 980 | + panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints); |
---|
| 981 | + autokeepCB.setToolTipText("On structure change"); |
---|
| 982 | + autokeepCB.addItemListener(this); |
---|
951 | 983 | |
---|
952 | 984 | panel.Return(); |
---|
953 | 985 | if (Globals.ADVANCED) |
---|
.. | .. |
---|
984 | 1016 | } |
---|
985 | 1017 | |
---|
986 | 1018 | radioButton.SetObject(obj); |
---|
987 | | - radioButton.layout = sevenButton; |
---|
| 1019 | + radioButton.layout = sixButton; // sevenButton; |
---|
988 | 1020 | radioButton.SetCamera(cameraView.renderCamera, false); |
---|
989 | 1021 | radioButton.addActionListener(this); |
---|
990 | 1022 | radioPanel.add(radioButton); |
---|
.. | .. |
---|
1024 | 1056 | |
---|
1025 | 1057 | cCheckBox oeilCB; |
---|
1026 | 1058 | cCheckBox shadowCB; |
---|
1027 | | - cCheckBox autosaveCB; |
---|
| 1059 | + cCheckBox autokeepCB; |
---|
1028 | 1060 | cCheckBox lookAtCB; |
---|
1029 | 1061 | |
---|
1030 | 1062 | // static int COLOR = 1; |
---|
.. | .. |
---|
1136 | 1168 | { |
---|
1137 | 1169 | Globals.FREEZEONMOVE ^= true; |
---|
1138 | 1170 | } |
---|
1139 | | - else if(e.getSource() == autosaveCB) |
---|
| 1171 | + else if(e.getSource() == autokeepCB) |
---|
1140 | 1172 | { |
---|
1141 | | - Globals.SAVEONMAKE ^= true; |
---|
| 1173 | + Globals.REPLACEONMAKE ^= true; |
---|
1142 | 1174 | } |
---|
1143 | 1175 | else if(e.getSource() == lookAtCB) |
---|
1144 | 1176 | { |
---|
.. | .. |
---|
1663 | 1695 | listUI.remove(i); |
---|
1664 | 1696 | } |
---|
1665 | 1697 | } |
---|
| 1698 | + } |
---|
| 1699 | + |
---|
| 1700 | + private void EditElement(Object3D elem, boolean newWindow) |
---|
| 1701 | + { |
---|
| 1702 | + // if (!(elem instanceof Composite)) |
---|
| 1703 | + // newWindow = false; |
---|
| 1704 | + listUI.add(elem); |
---|
| 1705 | + elem.openEditWindow(this, newWindow); //, false); |
---|
| 1706 | + System.out.println("edit : " + elem); |
---|
| 1707 | + elem.editWindow.refreshContents(true); // ? new |
---|
1666 | 1708 | } |
---|
1667 | 1709 | |
---|
1668 | 1710 | /** |
---|
.. | .. |
---|
2225 | 2267 | } else |
---|
2226 | 2268 | if (source == undoButton) |
---|
2227 | 2269 | { |
---|
2228 | | - if (!Undo()) |
---|
2229 | | - java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 2270 | + // Go to previous version |
---|
| 2271 | + //if (!Undo()) |
---|
| 2272 | + //java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
| 2273 | + Undo(); |
---|
| 2274 | + } else |
---|
| 2275 | + if (source == restoreButton) |
---|
| 2276 | + { |
---|
| 2277 | + // Restore current version |
---|
| 2278 | + Restore(); |
---|
| 2279 | + } else |
---|
| 2280 | + if (source == replaceButton) |
---|
| 2281 | + { |
---|
| 2282 | + // Overwrite current version |
---|
| 2283 | + Replace(); |
---|
2230 | 2284 | } else |
---|
2231 | 2285 | if (source == redoButton) |
---|
2232 | 2286 | { |
---|
| 2287 | + // Go to next version |
---|
2233 | 2288 | Redo(); |
---|
2234 | 2289 | } else |
---|
2235 | 2290 | if (source == saveButton) |
---|
2236 | 2291 | { |
---|
| 2292 | + // Save a new version |
---|
2237 | 2293 | if (!Save(true)) |
---|
2238 | 2294 | java.awt.Toolkit.getDefaultToolkit().beep(); |
---|
2239 | 2295 | } else |
---|
.. | .. |
---|
2615 | 2671 | { |
---|
2616 | 2672 | StepAll(); |
---|
2617 | 2673 | } else |
---|
2618 | | - if (source == clearItem) // || event.getSource() == clearButton) |
---|
| 2674 | + if (source == deleteItem) // || event.getSource() == clearButton) |
---|
2619 | 2675 | { |
---|
2620 | 2676 | //int indices[] = jList.getSelectedIndices(); |
---|
2621 | 2677 | //for (int i = indices.length - 1; i >= 0; i--) |
---|
.. | .. |
---|
3479 | 3535 | } |
---|
3480 | 3536 | |
---|
3481 | 3537 | copy = group; |
---|
| 3538 | + |
---|
| 3539 | + SetUndoStates(); |
---|
| 3540 | + |
---|
3482 | 3541 | //Globals.theRenderer.object = group; |
---|
3483 | 3542 | if(!useclient) |
---|
3484 | 3543 | { |
---|
.. | .. |
---|
3507 | 3566 | radio.layout.doClick(); |
---|
3508 | 3567 | |
---|
3509 | 3568 | ClearUnpinned(); |
---|
3510 | | - SetPinStates(group.selection.size() > 0); |
---|
3511 | | - if (group.selection.size() == 1) |
---|
| 3569 | + //Grafreed.Assert(group != null); |
---|
| 3570 | + //Grafreed.Assert(group.selection != null); |
---|
| 3571 | + SetPinStates(group.selection == null || group.selection.size() > 0); |
---|
| 3572 | + if (group.selection == null || group.selection.size() == 1) |
---|
3512 | 3573 | EditSelection(false); |
---|
3513 | 3574 | keepparent = group.parent; |
---|
3514 | 3575 | // PARENT = NULL or not??? |
---|
.. | .. |
---|
4579 | 4640 | |
---|
4580 | 4641 | void EditSelection(boolean newWindow) |
---|
4581 | 4642 | { |
---|
| 4643 | + if (group.selection == null) |
---|
| 4644 | + { |
---|
| 4645 | + EditElement(group, newWindow); // ? new |
---|
| 4646 | + return; |
---|
| 4647 | + } |
---|
| 4648 | + |
---|
4582 | 4649 | // aConstraints.gridy = 0; |
---|
4583 | 4650 | for (int i=0; i<group.selection.size(); i++) |
---|
4584 | 4651 | { |
---|
.. | .. |
---|
4589 | 4656 | Object3D elem = (Object3D)group.selection.elementAt(i); |
---|
4590 | 4657 | if(elem != group || !newWindow) |
---|
4591 | 4658 | { |
---|
4592 | | - // if (!(elem instanceof Composite)) |
---|
4593 | | - // newWindow = false; |
---|
4594 | | - listUI.add(elem); |
---|
4595 | | - elem.openEditWindow(this, newWindow); //, false); |
---|
4596 | | - System.out.println("edit : " + elem); |
---|
4597 | | - elem.editWindow.refreshContents(true); // ? new |
---|
| 4659 | + EditElement(elem, newWindow); // ? new |
---|
4598 | 4660 | } |
---|
4599 | 4661 | } |
---|
4600 | 4662 | } |
---|
.. | .. |
---|
4738 | 4800 | |
---|
4739 | 4801 | void refreshContents(boolean cp) |
---|
4740 | 4802 | { |
---|
4741 | | - if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info")) |
---|
| 4803 | + if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info")) |
---|
4742 | 4804 | if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING) |
---|
4743 | 4805 | { |
---|
4744 | 4806 | objEditor.ClearInfo(); // .GetMaterial()); |
---|
.. | .. |
---|
4942 | 5004 | |
---|
4943 | 5005 | void paste(boolean expand) |
---|
4944 | 5006 | { |
---|
4945 | | - if (Globals.SAVEONMAKE) |
---|
| 5007 | + if (Globals.REPLACEONMAKE) |
---|
4946 | 5008 | Save(); |
---|
4947 | | - boolean keep = Globals.SAVEONMAKE; |
---|
4948 | | - Globals.SAVEONMAKE = false; |
---|
| 5009 | + boolean keep = Globals.REPLACEONMAKE; |
---|
| 5010 | + Globals.REPLACEONMAKE = false; |
---|
4949 | 5011 | // if (GrafreeD.clipboard == null) |
---|
4950 | 5012 | // return; |
---|
4951 | 5013 | boolean first = true; |
---|
.. | .. |
---|
5005 | 5067 | Grafreed.clipboard.get(0).parent = keepparent; |
---|
5006 | 5068 | } |
---|
5007 | 5069 | |
---|
5008 | | - Globals.SAVEONMAKE = keep; |
---|
| 5070 | + Globals.REPLACEONMAKE = keep; |
---|
5009 | 5071 | ResetModel(); |
---|
5010 | 5072 | refreshContents(); |
---|
5011 | 5073 | } |
---|
.. | .. |
---|
5141 | 5203 | |
---|
5142 | 5204 | void group(Object3D csg, boolean grab) |
---|
5143 | 5205 | { |
---|
5144 | | - if (Globals.SAVEONMAKE) |
---|
| 5206 | + if (Globals.REPLACEONMAKE) |
---|
5145 | 5207 | Save(); |
---|
5146 | | - boolean keep = Globals.SAVEONMAKE; |
---|
5147 | | - Globals.SAVEONMAKE = false; |
---|
| 5208 | + boolean keep = Globals.REPLACEONMAKE; |
---|
| 5209 | + Globals.REPLACEONMAKE = false; |
---|
5148 | 5210 | if (//false) // why?? |
---|
5149 | 5211 | !group.selection.isEmpty()) |
---|
5150 | 5212 | { |
---|
.. | .. |
---|
5258 | 5320 | //node.add(csg); |
---|
5259 | 5321 | //makeSomething(node); |
---|
5260 | 5322 | makeSomething(csg); |
---|
5261 | | - Globals.SAVEONMAKE = keep; |
---|
| 5323 | + Globals.REPLACEONMAKE = keep; |
---|
5262 | 5324 | } |
---|
5263 | 5325 | |
---|
5264 | 5326 | void Ungroup(Object3D g) |
---|
5265 | 5327 | { |
---|
5266 | | - if (Globals.SAVEONMAKE) |
---|
| 5328 | + if (Globals.REPLACEONMAKE) |
---|
5267 | 5329 | Save(); |
---|
5268 | | - boolean keep = Globals.SAVEONMAKE; |
---|
5269 | | - Globals.SAVEONMAKE = false; |
---|
| 5330 | + boolean keep = Globals.REPLACEONMAKE; |
---|
| 5331 | + Globals.REPLACEONMAKE = false; |
---|
5270 | 5332 | if (g instanceof HiddenObject) |
---|
5271 | 5333 | { |
---|
5272 | 5334 | HiddenObject h = (HiddenObject) g; |
---|
.. | .. |
---|
5283 | 5345 | objEditor.makeSomething(g.get(i), false); |
---|
5284 | 5346 | } |
---|
5285 | 5347 | } |
---|
5286 | | - Globals.SAVEONMAKE = keep; |
---|
| 5348 | + Globals.REPLACEONMAKE = keep; |
---|
5287 | 5349 | } |
---|
5288 | 5350 | |
---|
5289 | 5351 | void ungroup() |
---|
.. | .. |
---|
5647 | 5709 | private MenuItem pasteLinkItem; |
---|
5648 | 5710 | private MenuItem pasteCloneItem; |
---|
5649 | 5711 | private MenuItem pasteExpandItem; |
---|
5650 | | - private MenuItem clearItem; |
---|
| 5712 | + private MenuItem deleteItem; |
---|
5651 | 5713 | private MenuItem clearAllItem; |
---|
5652 | 5714 | private MenuItem genUVItem; |
---|
5653 | 5715 | private MenuItem genNormalsMESHItem; |
---|