blame | history | patch | commit | commitdiff
Normand Briere
2019-07-21 76522bc3ee92bd50dbd946d7f865666be4ad7bac 
 GroupEditor.java
....@@ -60,6 +60,12 @@
6060 		this.copy = this.group = group;
6161 		//selectees = this.group.selectees;
6262 		
63
+        if (copy.versions == null)
64
+        {
65
+            copy.versions = new byte[100][];
66
+            copy.versionindex = -1;
67
+        }
68
+        
6369 		if(ui)
6470                     SetupUI(objEditor);
6571 	}
....@@ -80,10 +86,22 @@
8086 		SetupViews(objEditor);
8187                 
8288                 ((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
+        }
8397 	}
8498 
8599     void CloneSelection(boolean supports)
86100     {
101
+        if (Globals.REPLACEONMAKE)
102
+            Save();
103
+        boolean keep = Globals.REPLACEONMAKE;
104
+        Globals.REPLACEONMAKE = false;
87105         //   Object3D keep = GrafreeD.clipboard;
88106            //Object3D obj;
89107            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
....@@ -94,6 +112,7 @@
94112                
95113                makeSomething(clone, i==group.selection.size()-1);
96114            }
115
+        Globals.REPLACEONMAKE = keep;
97116     }
98117 
99118     void CloneClipboard(boolean supports)
....@@ -189,8 +208,8 @@
189208 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190209 //		pasteExpandItem.addActionListener(this);
191210 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
211
+		deleteItem = menu.add(new MenuItem("Delete"));
212
+		deleteItem.addActionListener(this);
194213                 
195214         if (Globals.ADVANCED)
196215         {
....@@ -380,13 +399,14 @@
380399 		shadowYItem.addActionListener(this);
381400                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382401 		shadowZItem.addActionListener(this);
402
+		attributeItem = menu.add(new MenuItem("Attribute"));
403
+		attributeItem.addActionListener(this);
404
+                
383405         if (Globals.ADVANCED)
384406         {
385407 		menu.add("-");
386408 		linkerItem = menu.add(new MenuItem("Linker"));
387409 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390410 		templateItem = menu.add(new MenuItem("Template"));
391411 		templateItem.addActionListener(this);
392412 		pointflowItem = menu.add(new MenuItem("Point Flow"));
....@@ -415,7 +435,7 @@
415435 		genNormalsMESHItem.addActionListener(this);
416436         if (Globals.ADVANCED)
417437         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
438
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419439 		genNormalsMINEItem.addActionListener(this);
420440         }
421441 		stripifyItem = menu.add(new MenuItem("Stripify"));
....@@ -538,6 +558,7 @@
538558 		buildToolsMenu(menu);
539559 	}
540560 	
561
+        
541562 	void SetupUI2(ObjEditor oe)
542563 	{
543564             // June 2019
....@@ -590,50 +611,66 @@
590611                 //minButton.setToolTipText("Minimize window");
591612 		//minButton.addActionListener(this);
592613                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
614
+                if (Globals.ADVANCED)
615
+                {
616
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617
+                    maxButton.setToolTipText("Maximize window");
618
+                    maxButton.addActionListener(this);
619
+                }
596620                 
597621 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598622                 fullButton.setToolTipText("Full-screen window");
599623 		fullButton.addActionListener(this);
600624                 
625
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626
+                screenfitButton.setToolTipText("Screen fit");
627
+		screenfitButton.addActionListener(this);
628
+
601629 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602630                 restoreCameraButton.setToolTipText("Restore viewpoint");
603631 		restoreCameraButton.addActionListener(this);
604632                 
633
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
+                saveButton.setToolTipText("New version");
635
+		saveButton.addActionListener(this);
636
+                                                
605637 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
-                undoButton.setToolTipText("Undo changes");
638
+                undoButton.setToolTipText("Previous version");
607639 		undoButton.addActionListener(this);
608640                 undoButton.setEnabled(false);
609641                 
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
+                
610655 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611
-                redoButton.setToolTipText("Redo changes");
656
+                redoButton.setToolTipText("Next version");
612657 		redoButton.addActionListener(this);
613658                 redoButton.setEnabled(false);
614659                 
615
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616
-                saveButton.setToolTipText("Save changes");
617
-		saveButton.addActionListener(this);
618
-                
619
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
660
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620661                 liveCB.setToolTipText("Enable animation");
621662                                 liveCB.addItemListener(this);
622663 
623
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
664
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624665                 oneStepButton.setToolTipText("Animate one step forward");
625666 		oneStepButton.addActionListener(this);
626667                 
627
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
668
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628669                 fastCB.setToolTipText("Fast mode");
629670                                 fastCB.addItemListener(this);
630671                                 
631672                 //oe.toolboxPanel.Return();
632673                 
633
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                screenfitButton.setToolTipText("Screen fit");
635
-		screenfitButton.addActionListener(this);
636
-
637674 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638675 //                trackCB.setToolTipText("Enable tracking");
639676 //                                trackCB.addItemListener(this);
....@@ -650,27 +687,28 @@
650687 
651688 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652689                 
653
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
-                twoButton.setToolTipText("Show center view only");
655
-		twoButton.addActionListener(this);
656
-                this.fullscreenLayout = twoButton;
657
-                
658690 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659691 		fourButton.addActionListener(this);
660692                 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
+                
661699 		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
-                sixButton.setToolTipText("2-column layout left");
700
+                sixButton.setToolTipText("Show left and right");
663701 		sixButton.addActionListener(this);
664
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
-                threeButton.setToolTipText("2-column layout right");
666
-		threeButton.addActionListener(this);
667
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
-                sevenButton.setToolTipText("3-column layout");
669
-		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);
670708                 //
671709 
672
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673
-                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");
674712 		rootButton.addActionListener(this);
675713 
676714                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -811,6 +849,9 @@
811849 
812850                 oe.treePanel.add(copyOptionsPanel);
813851                 oe.treePanel.Return();
852
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
853
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
854
+            sliderPane.preferredHeight = 1;
814855                 
815856 //        mainPanel.setDividerLocation(0.5); //1.0);
816857 //        mainPanel.setResizeWeight(0.5);
....@@ -833,7 +874,7 @@
833874 		dgr.addDragGestureListener(this);
834875 		}catch(Exception e) {}
835876 		*/
836
-        radio.layout = sevenButton;
877
+        radio.layout = sixButton; // sevenButton;
837878         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838879 	}
839880         
....@@ -936,9 +977,9 @@
936977                 toggleSwitchCB.setToolTipText("Choose a single item");
937978                                 toggleSwitchCB.addItemListener(this);
938979                                 
939
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940
-                autosaveCB.setToolTipText("On structure change");
941
-                                autosaveCB.addItemListener(this);
980
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
981
+                autokeepCB.setToolTipText("On structure change");
982
+                                autokeepCB.addItemListener(this);
942983 
943984                 panel.Return();
944985             if (Globals.ADVANCED)
....@@ -967,7 +1008,7 @@
9671008         {
9681009             cRadio radioButton = new cRadio(obj.name);
9691010             
970
-            // Patch to avoid bug with transparency.
1011
+            // June 2019. Patch to avoid bug with transparency.
9711012             radioButton.hadMaterial = obj.material != null;
9721013             if (!radioButton.hadMaterial)
9731014             {
....@@ -975,7 +1016,7 @@
9751016             }
9761017             
9771018             radioButton.SetObject(obj);
978
-            radioButton.layout = sevenButton;
1019
+            radioButton.layout = sixButton; // sevenButton;
9791020             radioButton.SetCamera(cameraView.renderCamera, false);
9801021             radioButton.addActionListener(this);
9811022             radioPanel.add(radioButton);
....@@ -1015,7 +1056,7 @@
10151056         
10161057         cCheckBox oeilCB;
10171058         cCheckBox shadowCB;
1018
-        cCheckBox autosaveCB;
1059
+        cCheckBox autokeepCB;
10191060         cCheckBox lookAtCB;
10201061         
10211062 //        static int COLOR = 1;
....@@ -1127,9 +1168,9 @@
11271168             {
11281169                 Globals.FREEZEONMOVE ^= true;
11291170             }
1130
-            else if(e.getSource() == autosaveCB)
1171
+            else if(e.getSource() == autokeepCB)
11311172             {
1132
-                Globals.SAVEONMAKE ^= true;
1173
+                Globals.REPLACEONMAKE ^= true;
11331174             }
11341175             else if(e.getSource() == lookAtCB)
11351176             {
....@@ -1211,8 +1252,6 @@
12111252                         }
12121253                     }
12131254                     
1214
-                    String string = (String) object;
1215
-                    
12161255                     System.out.println("Transfer = " + object + "; drop : " + target);
12171256 //                    if( object instanceof java.io.File[])
12181257 //                    {
....@@ -1220,6 +1259,8 @@
12201259 //                        objEditor.DropFile((java.io.File[]) object, true);
12211260 //                        return;
12221261 //                    }
1262
+                    
1263
+                    String string = object.toString();
12231264                     
12241265                     // File path for Mac and Windows
12251266                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
....@@ -1469,6 +1510,9 @@
14691510 		animationItem.addItemListener(this);
14701511                 animationItem.setState(Globals.ANIMATION);
14711512                 
1513
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1514
+		archiveItem.addActionListener(this);
1515
+                
14721516 		menu.add("-");
14731517 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
14741518 		parseverticesItem.addActionListener(this);
....@@ -1481,6 +1525,8 @@
14811525 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
14821526 		reduce34MorphItem.addActionListener(this);
14831527 		menu.add("-");
1528
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1529
+		memoryItem.addActionListener(this);
14841530 		menu.add(computeAOItem = new MenuItem("Compute AO"));
14851531 		computeAOItem.addActionListener(this);
14861532                 
....@@ -1489,8 +1535,6 @@
14891535 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
14901536 		mirrorItem.addActionListener(this);
14911537 		menu.add("-");
1492
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1493
-		memoryItem.addActionListener(this);
14941538 		menu.add(analyzeItem = new MenuItem("Analyze"));
14951539 		analyzeItem.addActionListener(this);
14961540 		menu.add(dumpItem = new MenuItem("Print"));
....@@ -1651,6 +1695,16 @@
16511695                 listUI.remove(i);
16521696             }
16531697         }
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
16541708     }
16551709         
16561710     /**
....@@ -2213,15 +2267,31 @@
22132267 		} else
22142268 		if (source == undoButton)
22152269 		{
2270
+                        // Go to previous version
2271
+			//if (!Undo())
2272
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
22162273 			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();
22172284 		} else
22182285 		if (source == redoButton)
22192286 		{
2287
+                        // Go to next version
22202288 			Redo();
22212289 		} else
22222290 		if (source == saveButton)
22232291 		{
2224
-			Save();
2292
+                        // Save a new version
2293
+			if (!Save(true))
2294
+                            java.awt.Toolkit.getDefaultToolkit().beep();
22252295 		} else
22262296 		if (source == oneStepButton)
22272297 		{
....@@ -2230,17 +2300,14 @@
22302300 		} else
22312301 		if (source == screenfitButton)
22322302 		{
2233
-			//Reload(lastConverter, lastFilename, true);
22342303                     ScreenFit();
22352304 		} else
22362305 		if (source == screenfitpointButton)
22372306 		{
2238
-			//Reload(lastConverter, lastFilename, true);
22392307                     ScreenFitPoint();
22402308 		} else
22412309 		if (source == snapobjectButton)
22422310 		{
2243
-			//Reload(lastConverter, lastFilename, true);
22442311                     SnapObject();
22452312 		} else
22462313 //		if (event.getSource() == recompileButton)
....@@ -2604,7 +2671,7 @@
26042671 		{
26052672 			StepAll();
26062673 		} else
2607
-		if (source == clearItem) // || event.getSource() == clearButton)
2674
+		if (source == deleteItem) // || event.getSource() == clearButton)
26082675 		{
26092676 			//int indices[] = jList.getSelectedIndices();
26102677 			//for (int i = indices.length - 1; i >= 0; i--)
....@@ -3468,6 +3535,9 @@
34683535                     }
34693536                     
34703537                     copy = group;
3538
+                    
3539
+                    SetUndoStates();
3540
+
34713541                     //Globals.theRenderer.object = group;
34723542                     if(!useclient)
34733543                     {
....@@ -3496,8 +3566,10 @@
34963566                     radio.layout.doClick();
34973567                     
34983568                     ClearUnpinned();
3499
-                    SetPinStates(group.selection.size() > 0);
3500
-                    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)
35013573                         EditSelection(false);
35023574                     keepparent = group.parent;
35033575                     // PARENT = NULL or not???
....@@ -4568,6 +4640,12 @@
45684640 	
45694641 	void EditSelection(boolean newWindow)
45704642 	{
4643
+                if (group.selection == null)
4644
+                {
4645
+                     EditElement(group, newWindow); // ? new
4646
+                     return;
4647
+                }
4648
+                
45714649         //    aConstraints.gridy = 0;
45724650 		for (int i=0; i<group.selection.size(); i++)
45734651 		{
....@@ -4578,12 +4656,7 @@
45784656 			Object3D elem = (Object3D)group.selection.elementAt(i);
45794657                         if(elem != group || !newWindow)
45804658                         {
4581
-                        //    if (!(elem instanceof Composite))
4582
-                        //        newWindow = false;
4583
-                            listUI.add(elem);
4584
-                            elem.openEditWindow(this, newWindow); //, false);
4585
-                            System.out.println("edit : " + elem);
4586
-                            elem.editWindow.refreshContents(true); // ? new
4659
+                            EditElement(elem, newWindow); // ? new
45874660                         }
45884661 		}
45894662 	}
....@@ -4727,8 +4800,8 @@
47274800 
47284801         void refreshContents(boolean cp)
47294802         {
4730
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4803
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4804
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
47324805             {
47334806                 objEditor.ClearInfo(); // .GetMaterial());
47344807 
....@@ -4827,8 +4900,8 @@
48274900                 
48284901 		if (cut)
48294902 		{
4830
-        if (Globals.SAVEONMAKE)
4831
-                    Save();
4903
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4904
+//                    Save();
48324905 			//int indices[] = jList.getSelectedIndices();
48334906 			//for (int i = indices.length - 1; i >= 0; i--)
48344907 			//jList.remove(indices[i]);
....@@ -4931,6 +5004,10 @@
49315004 	
49325005 	void paste(boolean expand)
49335006 	{
5007
+        if (Globals.REPLACEONMAKE)
5008
+            Save();
5009
+        boolean keep = Globals.REPLACEONMAKE;
5010
+        Globals.REPLACEONMAKE = false;
49345011 	//	if (GrafreeD.clipboard == null)
49355012 	//		return;
49365013 		boolean first = true;
....@@ -4990,6 +5067,7 @@
49905067                         Grafreed.clipboard.get(0).parent = keepparent;
49915068 		}
49925069 		
5070
+        Globals.REPLACEONMAKE = keep;
49935071 		ResetModel();
49945072 		refreshContents();
49955073 	}
....@@ -5125,6 +5203,10 @@
51255203         
51265204 	void group(Object3D csg, boolean grab)
51275205 	{
5206
+        if (Globals.REPLACEONMAKE)
5207
+            Save();
5208
+        boolean keep = Globals.REPLACEONMAKE;
5209
+        Globals.REPLACEONMAKE = false;
51285210 		if (//false) // why??
51295211                     !group.selection.isEmpty())
51305212                 {
....@@ -5238,10 +5320,15 @@
52385320                 //node.add(csg);
52395321 		//makeSomething(node);
52405322 		makeSomething(csg);
5323
+        Globals.REPLACEONMAKE = keep;
52415324 	}
52425325 	
52435326         void Ungroup(Object3D g)
52445327         {
5328
+        if (Globals.REPLACEONMAKE)
5329
+            Save();
5330
+        boolean keep = Globals.REPLACEONMAKE;
5331
+        Globals.REPLACEONMAKE = false;
52455332             if (g instanceof HiddenObject)
52465333             {
52475334                 HiddenObject h = (HiddenObject) g;
....@@ -5258,6 +5345,7 @@
52585345                     objEditor.makeSomething(g.get(i), false);
52595346                 }
52605347             }
5348
+        Globals.REPLACEONMAKE = keep;
52615349         }
52625350         
52635351 	void ungroup()
....@@ -5621,7 +5709,7 @@
56215709 	private MenuItem pasteLinkItem;
56225710 	private MenuItem pasteCloneItem;
56235711 	private MenuItem pasteExpandItem;
5624
-	private MenuItem clearItem;
5712
+	private MenuItem deleteItem;
56255713 	private MenuItem clearAllItem;
56265714 	private MenuItem genUVItem;
56275715 	private MenuItem genNormalsMESHItem;