Fix usecalllist = false

Normand Briere

2019-07-24 f555e2cacc4470c5b2217a14d40d2b39c4a57ba2

 GroupEditor.java
..
..
@@ -60,6 +60,12 @@
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,10 +86,22 @@
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
     {
101
+        if (Globals.REPLACEONMAKE)
102
+            Save();
103
+        boolean keep = Globals.REPLACEONMAKE;
104
+        Globals.REPLACEONMAKE = false;
87
105
         //   Object3D keep = GrafreeD.clipboard;
88
106
            //Object3D obj;
89
107
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +112,7 @@
94
112
                
95
113
                makeSomething(clone, i==group.selection.size()-1);
96
114
            }
115
+        Globals.REPLACEONMAKE = keep;
97
116
     }
98
117
 
99
118
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +208,8 @@
189
208
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
209
 //		pasteExpandItem.addActionListener(this);
191
210
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
211
+		deleteItem = menu.add(new MenuItem("Delete"));
212
+		deleteItem.addActionListener(this);
194
213
                 
195
214
         if (Globals.ADVANCED)
196
215
         {
..
..
@@ -380,13 +399,14 @@
380
399
 		shadowYItem.addActionListener(this);
381
400
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
401
 		shadowZItem.addActionListener(this);
402
+		attributeItem = menu.add(new MenuItem("Attribute"));
403
+		attributeItem.addActionListener(this);
404
+                
383
405
         if (Globals.ADVANCED)
384
406
         {
385
407
 		menu.add("-");
386
408
 		linkerItem = menu.add(new MenuItem("Linker"));
387
409
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
410
 		templateItem = menu.add(new MenuItem("Template"));
391
411
 		templateItem.addActionListener(this);
392
412
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +435,7 @@
415
435
 		genNormalsMESHItem.addActionListener(this);
416
436
         if (Globals.ADVANCED)
417
437
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
438
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
439
 		genNormalsMINEItem.addActionListener(this);
420
440
         }
421
441
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -508,10 +528,15 @@
508
528
 		attachBumpItem.addActionListener(this);
509
529
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510
530
 		pigmentBumpItem.addActionListener(this);
531
+                //embedTexturesItem
511
532
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512
533
 		detachPigmentItem.addActionListener(this);
513
534
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514
535
 		detachBumpItem.addActionListener(this);
536
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
537
+		embedTexturesItem.addActionListener(this);
538
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
539
+		deEmbedTexturesItem.addActionListener(this);
515
540
 		menu.add("-");
516
541
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517
542
 		sortbysizeItem.addActionListener(this);
..
..
@@ -538,6 +563,7 @@
538
563
 		buildToolsMenu(menu);
539
564
 	}
540
565
 	
566
+        
541
567
 	void SetupUI2(ObjEditor oe)
542
568
 	{
543
569
             // June 2019
..
..
@@ -590,50 +616,66 @@
590
616
                 //minButton.setToolTipText("Minimize window");
591
617
 		//minButton.addActionListener(this);
592
618
                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
619
+                if (Globals.ADVANCED)
620
+                {
621
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622
+                    maxButton.setToolTipText("Maximize window");
623
+                    maxButton.addActionListener(this);
624
+                }
596
625
                 
597
626
 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
627
                 fullButton.setToolTipText("Full-screen window");
599
628
 		fullButton.addActionListener(this);
600
629
                 
630
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
631
+                screenfitButton.setToolTipText("Screen fit");
632
+		screenfitButton.addActionListener(this);
633
+
601
634
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
635
                 restoreCameraButton.setToolTipText("Restore viewpoint");
603
636
 		restoreCameraButton.addActionListener(this);
604
637
                 
638
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
639
+                saveButton.setToolTipText("New version");
640
+		saveButton.addActionListener(this);
641
+                                                
605
642
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
-                undoButton.setToolTipText("Undo changes");
643
+                undoButton.setToolTipText("Previous version");
607
644
 		undoButton.addActionListener(this);
608
645
                 undoButton.setEnabled(false);
609
646
                 
647
+                cGridBag updown = new cGridBag().setVertical(true);
648
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
649
+                restoreButton.setToolTipText("Restore current");
650
+		restoreButton.addActionListener(this);
651
+                restoreButton.setEnabled(false);
652
+                
653
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654
+                replaceButton.setToolTipText("Replace current");
655
+		replaceButton.addActionListener(this);
656
+                replaceButton.setEnabled(false);
657
+                
658
+                copyOptionsPanel.add(updown);
659
+                
610
660
 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611
-                redoButton.setToolTipText("Redo changes");
661
+                redoButton.setToolTipText("Next version");
612
662
 		redoButton.addActionListener(this);
613
663
                 redoButton.setEnabled(false);
614
664
                 
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);
665
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620
666
                 liveCB.setToolTipText("Enable animation");
621
667
                                 liveCB.addItemListener(this);
622
668
 
623
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
669
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
670
                 oneStepButton.setToolTipText("Animate one step forward");
625
671
 		oneStepButton.addActionListener(this);
626
672
                 
627
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
673
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628
674
                 fastCB.setToolTipText("Fast mode");
629
675
                                 fastCB.addItemListener(this);
630
676
                                 
631
677
                 //oe.toolboxPanel.Return();
632
678
                 
633
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634
-                screenfitButton.setToolTipText("Screen fit");
635
-		screenfitButton.addActionListener(this);
636
-
637
679
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638
680
 //                trackCB.setToolTipText("Enable tracking");
639
681
 //                                trackCB.addItemListener(this);
..
..
@@ -650,27 +692,28 @@
650
692
 
651
693
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
652
694
                 
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
-                
658
695
 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
659
696
 		fourButton.addActionListener(this);
660
697
                 fourButton.setToolTipText("Show left panel only");
698
+                
699
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
+                twoButton.setToolTipText("Show right view only");
701
+		twoButton.addActionListener(this);
702
+                this.fullscreenLayout = twoButton;
703
+                
661
704
 		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
-                sixButton.setToolTipText("2-column layout left");
705
+                sixButton.setToolTipText("Show left and right");
663
706
 		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);
707
+//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+//                threeButton.setToolTipText("2-column layout right");
709
+//		threeButton.addActionListener(this);
710
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711
+//                sevenButton.setToolTipText("3-column layout");
712
+//		sevenButton.addActionListener(this);
670
713
                 //
671
714
 
672
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
673
-                rootButton.setToolTipText("Edit selection in new tab");
715
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
716
+                rootButton.setToolTipText("Open selection in new tab");
674
717
 		rootButton.addActionListener(this);
675
718
 
676
719
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -811,6 +854,9 @@
811
854
 
812
855
                 oe.treePanel.add(copyOptionsPanel);
813
856
                 oe.treePanel.Return();
857
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
858
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
859
+            sliderPane.preferredHeight = 1;
814
860
                 
815
861
 //        mainPanel.setDividerLocation(0.5); //1.0);
816
862
 //        mainPanel.setResizeWeight(0.5);
..
..
@@ -833,7 +879,7 @@
833
879
 		dgr.addDragGestureListener(this);
834
880
 		}catch(Exception e) {}
835
881
 		*/
836
-        radio.layout = sevenButton;
882
+        radio.layout = sixButton; // sevenButton;
837
883
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
838
884
 	}
839
885
         
..
..
@@ -936,9 +982,9 @@
936
982
                 toggleSwitchCB.setToolTipText("Choose a single item");
937
983
                                 toggleSwitchCB.addItemListener(this);
938
984
                                 
939
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
940
-                autosaveCB.setToolTipText("On structure change");
941
-                                autosaveCB.addItemListener(this);
985
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
986
+                autokeepCB.setToolTipText("On structure change");
987
+                                autokeepCB.addItemListener(this);
942
988
 
943
989
                 panel.Return();
944
990
             if (Globals.ADVANCED)
..
..
@@ -967,7 +1013,7 @@
967
1013
         {
968
1014
             cRadio radioButton = new cRadio(obj.name);
969
1015
             
970
-            // Patch to avoid bug with transparency.
1016
+            // June 2019. Patch to avoid bug with transparency.
971
1017
             radioButton.hadMaterial = obj.material != null;
972
1018
             if (!radioButton.hadMaterial)
973
1019
             {
..
..
@@ -975,7 +1021,7 @@
975
1021
             }
976
1022
             
977
1023
             radioButton.SetObject(obj);
978
-            radioButton.layout = sevenButton;
1024
+            radioButton.layout = sixButton; // sevenButton;
979
1025
             radioButton.SetCamera(cameraView.renderCamera, false);
980
1026
             radioButton.addActionListener(this);
981
1027
             radioPanel.add(radioButton);
..
..
@@ -1015,7 +1061,7 @@
1015
1061
         
1016
1062
         cCheckBox oeilCB;
1017
1063
         cCheckBox shadowCB;
1018
-        cCheckBox autosaveCB;
1064
+        cCheckBox autokeepCB;
1019
1065
         cCheckBox lookAtCB;
1020
1066
         
1021
1067
 //        static int COLOR = 1;
..
..
@@ -1127,9 +1173,9 @@
1127
1173
             {
1128
1174
                 Globals.FREEZEONMOVE ^= true;
1129
1175
             }
1130
-            else if(e.getSource() == autosaveCB)
1176
+            else if(e.getSource() == autokeepCB)
1131
1177
             {
1132
-                Globals.SAVEONMAKE ^= true;
1178
+                Globals.REPLACEONMAKE ^= true;
1133
1179
             }
1134
1180
             else if(e.getSource() == lookAtCB)
1135
1181
             {
..
..
@@ -1211,8 +1257,6 @@
1211
1257
                         }
1212
1258
                     }
1213
1259
                     
1214
-                    String string = (String) object;
1215
-                    
1216
1260
                     System.out.println("Transfer = " + object + "; drop : " + target);
1217
1261
 //                    if( object instanceof java.io.File[])
1218
1262
 //                    {
..
..
@@ -1220,6 +1264,8 @@
1220
1264
 //                        objEditor.DropFile((java.io.File[]) object, true);
1221
1265
 //                        return;
1222
1266
 //                    }
1267
+                    
1268
+                    String string = object.toString();
1223
1269
                     
1224
1270
                     // File path for Mac and Windows
1225
1271
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1469,6 +1515,9 @@
1469
1515
 		animationItem.addItemListener(this);
1470
1516
                 animationItem.setState(Globals.ANIMATION);
1471
1517
                 
1518
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1519
+		archiveItem.addActionListener(this);
1520
+                
1472
1521
 		menu.add("-");
1473
1522
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1474
1523
 		parseverticesItem.addActionListener(this);
..
..
@@ -1481,6 +1530,8 @@
1481
1530
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1482
1531
 		reduce34MorphItem.addActionListener(this);
1483
1532
 		menu.add("-");
1533
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1534
+		memoryItem.addActionListener(this);
1484
1535
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1485
1536
 		computeAOItem.addActionListener(this);
1486
1537
                 
..
..
@@ -1489,8 +1540,6 @@
1489
1540
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1490
1541
 		mirrorItem.addActionListener(this);
1491
1542
 		menu.add("-");
1492
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1493
-		memoryItem.addActionListener(this);
1494
1543
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1495
1544
 		analyzeItem.addActionListener(this);
1496
1545
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1651,6 +1700,16 @@
1651
1700
                 listUI.remove(i);
1652
1701
             }
1653
1702
         }
1703
+    }
1704
+
1705
+    private void EditElement(Object3D elem, boolean newWindow)
1706
+    {
1707
+        //    if (!(elem instanceof Composite))
1708
+        //        newWindow = false;
1709
+            listUI.add(elem);
1710
+            elem.openEditWindow(this, newWindow); //, false);
1711
+            System.out.println("edit : " + elem);
1712
+            elem.editWindow.refreshContents(true); // ? new
1654
1713
     }
1655
1714
         
1656
1715
     /**
..
..
@@ -2213,15 +2272,31 @@
2213
2272
 		} else
2214
2273
 		if (source == undoButton)
2215
2274
 		{
2275
+                        // Go to previous version
2276
+			//if (!Undo())
2277
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2216
2278
 			Undo();
2279
+		} else
2280
+		if (source == restoreButton)
2281
+		{
2282
+                        // Restore current version
2283
+			Restore();
2284
+		} else
2285
+		if (source == replaceButton)
2286
+		{
2287
+                        // Overwrite current version
2288
+			Replace();
2217
2289
 		} else
2218
2290
 		if (source == redoButton)
2219
2291
 		{
2292
+                        // Go to next version
2220
2293
 			Redo();
2221
2294
 		} else
2222
2295
 		if (source == saveButton)
2223
2296
 		{
2224
-			Save();
2297
+                        // Save a new version
2298
+			if (!Save(true))
2299
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2225
2300
 		} else
2226
2301
 		if (source == oneStepButton)
2227
2302
 		{
..
..
@@ -2230,17 +2305,14 @@
2230
2305
 		} else
2231
2306
 		if (source == screenfitButton)
2232
2307
 		{
2233
-			//Reload(lastConverter, lastFilename, true);
2234
2308
                     ScreenFit();
2235
2309
 		} else
2236
2310
 		if (source == screenfitpointButton)
2237
2311
 		{
2238
-			//Reload(lastConverter, lastFilename, true);
2239
2312
                     ScreenFitPoint();
2240
2313
 		} else
2241
2314
 		if (source == snapobjectButton)
2242
2315
 		{
2243
-			//Reload(lastConverter, lastFilename, true);
2244
2316
                     SnapObject();
2245
2317
 		} else
2246
2318
 //		if (event.getSource() == recompileButton)
..
..
@@ -2604,7 +2676,7 @@
2604
2676
 		{
2605
2677
 			StepAll();
2606
2678
 		} else
2607
-		if (source == clearItem) // || event.getSource() == clearButton)
2679
+		if (source == deleteItem) // || event.getSource() == clearButton)
2608
2680
 		{
2609
2681
 			//int indices[] = jList.getSelectedIndices();
2610
2682
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3086,7 +3158,7 @@
3086
3158
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3087
3159
 			{
3088
3160
 				obj = (Object3D)e.nextElement();
3089
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
3090
3162
 			}
3091
3163
 			
3092
3164
 			refreshContents();
..
..
@@ -3100,6 +3172,31 @@
3100
3172
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3101
3173
 			}
3102
3174
 			
3175
+			refreshContents();
3176
+		} else
3177
+		if (source == embedTexturesItem)
3178
+		{
3179
+			Object3D obj;
3180
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3181
+			{
3182
+				obj = (Object3D)e.nextElement();
3183
+                                obj.EmbedTextures(true);
3184
+			}
3185
+			
3186
+			refreshContents();
3187
+		} else
3188
+		if (source == deEmbedTexturesItem)
3189
+		{
3190
+			Object3D obj;
3191
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3192
+			{
3193
+				obj = (Object3D)e.nextElement();
3194
+                                obj.EmbedTextures(false);
3195
+			}
3196
+			
3197
+                CameraPane.texturepigment.clear();
3198
+                CameraPane.texturebump.clear();
3199
+                
3103
3200
 			refreshContents();
3104
3201
 		} else
3105
3202
 		if (source == flashSelectionButton)
..
..
@@ -3468,6 +3565,9 @@
3468
3565
                     }
3469
3566
                     
3470
3567
                     copy = group;
3568
+                    
3569
+                    SetUndoStates();
3570
+
3471
3571
                     //Globals.theRenderer.object = group;
3472
3572
                     if(!useclient)
3473
3573
                     {
..
..
@@ -3496,8 +3596,10 @@
3496
3596
                     radio.layout.doClick();
3497
3597
                     
3498
3598
                     ClearUnpinned();
3499
-                    SetPinStates(group.selection.size() > 0);
3500
-                    if (group.selection.size() == 1)
3599
+                    //Grafreed.Assert(group != null);
3600
+                    //Grafreed.Assert(group.selection != null);
3601
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3602
+                    if (group.selection == null || group.selection.size() == 1)
3501
3603
                         EditSelection(false);
3502
3604
                     keepparent = group.parent;
3503
3605
                     // PARENT = NULL or not???
..
..
@@ -4091,7 +4193,7 @@
4091
4193
                             
4092
4194
                             try
4093
4195
                             {
4094
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4095
4197
                             }
4096
4198
                             catch (Exception e)
4097
4199
                             {
..
..
@@ -4568,6 +4670,12 @@
4568
4670
 	
4569
4671
 	void EditSelection(boolean newWindow)
4570
4672
 	{
4673
+                if (group.selection == null)
4674
+                {
4675
+                     EditElement(group, newWindow); // ? new
4676
+                     return;
4677
+                }
4678
+                
4571
4679
         //    aConstraints.gridy = 0;
4572
4680
 		for (int i=0; i<group.selection.size(); i++)
4573
4681
 		{
..
..
@@ -4578,12 +4686,7 @@
4578
4686
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4579
4687
                         if(elem != group || !newWindow)
4580
4688
                         {
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
4689
+                            EditElement(elem, newWindow); // ? new
4587
4690
                         }
4588
4691
 		}
4589
4692
 	}
..
..
@@ -4727,8 +4830,8 @@
4727
4830
 
4728
4831
         void refreshContents(boolean cp)
4729
4832
         {
4730
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4731
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4833
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4834
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4732
4835
             {
4733
4836
                 objEditor.ClearInfo(); // .GetMaterial());
4734
4837
 
..
..
@@ -4827,8 +4930,8 @@
4827
4930
                 
4828
4931
 		if (cut)
4829
4932
 		{
4830
-        if (Globals.SAVEONMAKE)
4831
-                    Save();
4933
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
4934
+//                    Save();
4832
4935
 			//int indices[] = jList.getSelectedIndices();
4833
4936
 			//for (int i = indices.length - 1; i >= 0; i--)
4834
4937
 			//jList.remove(indices[i]);
..
..
@@ -4931,6 +5034,10 @@
4931
5034
 	
4932
5035
 	void paste(boolean expand)
4933
5036
 	{
5037
+        if (Globals.REPLACEONMAKE)
5038
+            Save();
5039
+        boolean keep = Globals.REPLACEONMAKE;
5040
+        Globals.REPLACEONMAKE = false;
4934
5041
 	//	if (GrafreeD.clipboard == null)
4935
5042
 	//		return;
4936
5043
 		boolean first = true;
..
..
@@ -4990,6 +5097,7 @@
4990
5097
                         Grafreed.clipboard.get(0).parent = keepparent;
4991
5098
 		}
4992
5099
 		
5100
+        Globals.REPLACEONMAKE = keep;
4993
5101
 		ResetModel();
4994
5102
 		refreshContents();
4995
5103
 	}
..
..
@@ -5125,6 +5233,10 @@
5125
5233
         
5126
5234
 	void group(Object3D csg, boolean grab)
5127
5235
 	{
5236
+        if (Globals.REPLACEONMAKE)
5237
+            Save();
5238
+        boolean keep = Globals.REPLACEONMAKE;
5239
+        Globals.REPLACEONMAKE = false;
5128
5240
 		if (//false) // why??
5129
5241
                     !group.selection.isEmpty())
5130
5242
                 {
..
..
@@ -5238,10 +5350,15 @@
5238
5350
                 //node.add(csg);
5239
5351
 		//makeSomething(node);
5240
5352
 		makeSomething(csg);
5353
+        Globals.REPLACEONMAKE = keep;
5241
5354
 	}
5242
5355
 	
5243
5356
         void Ungroup(Object3D g)
5244
5357
         {
5358
+        if (Globals.REPLACEONMAKE)
5359
+            Save();
5360
+        boolean keep = Globals.REPLACEONMAKE;
5361
+        Globals.REPLACEONMAKE = false;
5245
5362
             if (g instanceof HiddenObject)
5246
5363
             {
5247
5364
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5258,6 +5375,7 @@
5258
5375
                     objEditor.makeSomething(g.get(i), false);
5259
5376
                 }
5260
5377
             }
5378
+        Globals.REPLACEONMAKE = keep;
5261
5379
         }
5262
5380
         
5263
5381
 	void ungroup()
..
..
@@ -5621,7 +5739,7 @@
5621
5739
 	private MenuItem pasteLinkItem;
5622
5740
 	private MenuItem pasteCloneItem;
5623
5741
 	private MenuItem pasteExpandItem;
5624
-	private MenuItem clearItem;
5742
+	private MenuItem deleteItem;
5625
5743
 	private MenuItem clearAllItem;
5626
5744
 	private MenuItem genUVItem;
5627
5745
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5705,6 +5823,8 @@
5705
5823
 	private MenuItem attachBumpItem;
5706
5824
 	private MenuItem detachBumpItem;
5707
5825
 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
5708
5828
 
5709
5829
 	private MenuItem particleItem;
5710
5830
 	private MenuItem ragdollItem;