~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -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
..	..	@@ -601,42 +627,55 @@
601	627	fullButton.setToolTipText("Full-screen window");
602	628	fullButton.addActionListener(this);
603	629
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
604	634	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	635	restoreCameraButton.setToolTipText("Restore viewpoint");
606	636	restoreCameraButton.addActionListener(this);
607	637
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
608	642	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609		- undoButton.setToolTipText("Undo changes");
	643	+ undoButton.setToolTipText("Previous version");
610	644	undoButton.addActionListener(this);
611	645	undoButton.setEnabled(false);
612	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	+
613	660	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- redoButton.setToolTipText("Redo changes");
	661	+ redoButton.setToolTipText("Next version");
615	662	redoButton.addActionListener(this);
616	663	redoButton.setEnabled(false);
617	664
618		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619		- saveButton.setToolTipText("Save changes");
620		- saveButton.addActionListener(this);
621		-
622		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623	666	liveCB.setToolTipText("Enable animation");
624	667	liveCB.addItemListener(this);
625	668
626		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627	670	oneStepButton.setToolTipText("Animate one step forward");
628	671	oneStepButton.addActionListener(this);
629	672
630		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631	674	fastCB.setToolTipText("Fast mode");
632	675	fastCB.addItemListener(this);
633	676
634	677	//oe.toolboxPanel.Return();
635	678
636		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637		- screenfitButton.setToolTipText("Screen fit");
638		- screenfitButton.addActionListener(this);
639		-
640	679	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641	680	// trackCB.setToolTipText("Enable tracking");
642	681	// trackCB.addItemListener(this);
..	..	@@ -653,27 +692,28 @@
653	692
654	693	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655	694
656		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- twoButton.setToolTipText("Show center view only");
658		- twoButton.addActionListener(this);
659		- this.fullscreenLayout = twoButton;
660		-
661	695	oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	696	fourButton.addActionListener(this);
663	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	+
664	704	oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665		- sixButton.setToolTipText("2-column layout left");
	705	+ sixButton.setToolTipText("Show left and right");
666	706	sixButton.addActionListener(this);
667		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668		- threeButton.setToolTipText("2-column layout right");
669		- threeButton.addActionListener(this);
670		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- sevenButton.setToolTipText("3-column layout");
672		- 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);
673	713	//
674	714
675		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676		- 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");
677	717	rootButton.addActionListener(this);
678	718
679	719	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -814,6 +854,9 @@
814	854
815	855	oe.treePanel.add(copyOptionsPanel);
816	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
817	860
818	861	// mainPanel.setDividerLocation(0.5); //1.0);
819	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -836,7 +879,7 @@
836	879	dgr.addDragGestureListener(this);
837	880	}catch(Exception e) {}
838	881	*/
839		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
840	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841	884	}
842	885
..	..	@@ -939,9 +982,9 @@
939	982	toggleSwitchCB.setToolTipText("Choose a single item");
940	983	toggleSwitchCB.addItemListener(this);
941	984
942		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943		- autosaveCB.setToolTipText("On structure change");
944		- autosaveCB.addItemListener(this);
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
945	988
946	989	panel.Return();
947	990	if (Globals.ADVANCED)
..	..	@@ -970,7 +1013,7 @@
970	1013	{
971	1014	cRadio radioButton = new cRadio(obj.name);
972	1015
973		- // Patch to avoid bug with transparency.
	1016	+ // June 2019. Patch to avoid bug with transparency.
974	1017	radioButton.hadMaterial = obj.material != null;
975	1018	if (!radioButton.hadMaterial)
976	1019	{
..	..	@@ -978,7 +1021,7 @@
978	1021	}
979	1022
980	1023	radioButton.SetObject(obj);
981		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
982	1025	radioButton.SetCamera(cameraView.renderCamera, false);
983	1026	radioButton.addActionListener(this);
984	1027	radioPanel.add(radioButton);
..	..	@@ -1018,7 +1061,7 @@
1018	1061
1019	1062	cCheckBox oeilCB;
1020	1063	cCheckBox shadowCB;
1021		- cCheckBox autosaveCB;
	1064	+ cCheckBox autokeepCB;
1022	1065	cCheckBox lookAtCB;
1023	1066
1024	1067	// static int COLOR = 1;
..	..	@@ -1130,9 +1173,9 @@
1130	1173	{
1131	1174	Globals.FREEZEONMOVE ^= true;
1132	1175	}
1133		- else if(e.getSource() == autosaveCB)
	1176	+ else if(e.getSource() == autokeepCB)
1134	1177	{
1135		- Globals.SAVEONMAKE ^= true;
	1178	+ Globals.REPLACEONMAKE ^= true;
1136	1179	}
1137	1180	else if(e.getSource() == lookAtCB)
1138	1181	{
..	..	@@ -1214,8 +1257,6 @@
1214	1257	}
1215	1258	}
1216	1259
1217		- String string = (String) object;
1218		-
1219	1260	System.out.println("Transfer = " + object + "; drop : " + target);
1220	1261	// if( object instanceof java.io.File[])
1221	1262	// {
..	..	@@ -1223,6 +1264,8 @@
1223	1264	// objEditor.DropFile((java.io.File[]) object, true);
1224	1265	// return;
1225	1266	// }
	1267	+
	1268	+ String string = object.toString();
1226	1269
1227	1270	// File path for Mac and Windows
1228	1271	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1472,8 +1515,8 @@
1472	1515	animationItem.addItemListener(this);
1473	1516	animationItem.setState(Globals.ANIMATION);
1474	1517
1475		- menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
1476		- archiveItem.addItemListener(this);
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
1477	1520
1478	1521	menu.add("-");
1479	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1487,6 +1530,8 @@
1487	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1488	1531	reduce34MorphItem.addActionListener(this);
1489	1532	menu.add("-");
	1533	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1534	+ memoryItem.addActionListener(this);
1490	1535	menu.add(computeAOItem = new MenuItem("Compute AO"));
1491	1536	computeAOItem.addActionListener(this);
1492	1537
..	..	@@ -1495,8 +1540,6 @@
1495	1540	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1496	1541	mirrorItem.addActionListener(this);
1497	1542	menu.add("-");
1498		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1499		- memoryItem.addActionListener(this);
1500	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1501	1544	analyzeItem.addActionListener(this);
1502	1545	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1657,6 +1700,16 @@
1657	1700	listUI.remove(i);
1658	1701	}
1659	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
1660	1713	}
1661	1714
1662	1715	/**
..	..	@@ -2219,15 +2272,31 @@
2219	2272	} else
2220	2273	if (source == undoButton)
2221	2274	{
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2222	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();
2223	2289	} else
2224	2290	if (source == redoButton)
2225	2291	{
	2292	+ // Go to next version
2226	2293	Redo();
2227	2294	} else
2228	2295	if (source == saveButton)
2229	2296	{
2230		- Save();
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
2231	2300	} else
2232	2301	if (source == oneStepButton)
2233	2302	{
..	..	@@ -2236,17 +2305,14 @@
2236	2305	} else
2237	2306	if (source == screenfitButton)
2238	2307	{
2239		- //Reload(lastConverter, lastFilename, true);
2240	2308	ScreenFit();
2241	2309	} else
2242	2310	if (source == screenfitpointButton)
2243	2311	{
2244		- //Reload(lastConverter, lastFilename, true);
2245	2312	ScreenFitPoint();
2246	2313	} else
2247	2314	if (source == snapobjectButton)
2248	2315	{
2249		- //Reload(lastConverter, lastFilename, true);
2250	2316	SnapObject();
2251	2317	} else
2252	2318	// if (event.getSource() == recompileButton)
..	..	@@ -2610,7 +2676,7 @@
2610	2676	{
2611	2677	StepAll();
2612	2678	} else
2613		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2614	2680	{
2615	2681	//int indices[] = jList.getSelectedIndices();
2616	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -3092,7 +3158,7 @@
3092	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093	3159	{
3094	3160	obj = (Object3D)e.nextElement();
3095		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
3096	3162	}
3097	3163
3098	3164	refreshContents();
..	..	@@ -3106,6 +3172,31 @@
3106	3172	obj.SetBumpTexture(obj.GetPigmentTexture());
3107	3173	}
3108	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	+
3109	3200	refreshContents();
3110	3201	} else
3111	3202	if (source == flashSelectionButton)
..	..	@@ -3474,6 +3565,9 @@
3474	3565	}
3475	3566
3476	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
3477	3571	//Globals.theRenderer.object = group;
3478	3572	if(!useclient)
3479	3573	{
..	..	@@ -3502,8 +3596,10 @@
3502	3596	radio.layout.doClick();
3503	3597
3504	3598	ClearUnpinned();
3505		- SetPinStates(group.selection.size() > 0);
3506		- 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)
3507	3603	EditSelection(false);
3508	3604	keepparent = group.parent;
3509	3605	// PARENT = NULL or not???
..	..	@@ -4097,7 +4193,7 @@
4097	4193
4098	4194	try
4099	4195	{
4100		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101	4197	}
4102	4198	catch (Exception e)
4103	4199	{
..	..	@@ -4574,6 +4670,12 @@
4574	4670
4575	4671	void EditSelection(boolean newWindow)
4576	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
4577	4679	// aConstraints.gridy = 0;
4578	4680	for (int i=0; i<group.selection.size(); i++)
4579	4681	{
..	..	@@ -4584,12 +4686,7 @@
4584	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
4585	4687	if(elem != group \|\| !newWindow)
4586	4688	{
4587		- // if (!(elem instanceof Composite))
4588		- // newWindow = false;
4589		- listUI.add(elem);
4590		- elem.openEditWindow(this, newWindow); //, false);
4591		- System.out.println("edit : " + elem);
4592		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4593	4690	}
4594	4691	}
4595	4692	}
..	..	@@ -4733,8 +4830,8 @@
4733	4830
4734	4831	void refreshContents(boolean cp)
4735	4832	{
4736		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4737		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738	4835	{
4739	4836	objEditor.ClearInfo(); // .GetMaterial());
4740	4837
..	..	@@ -4833,8 +4930,8 @@
4833	4930
4834	4931	if (cut)
4835	4932	{
4836		- if (Globals.SAVEONMAKE)
4837		- Save();
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4838	4935	//int indices[] = jList.getSelectedIndices();
4839	4936	//for (int i = indices.length - 1; i >= 0; i--)
4840	4937	//jList.remove(indices[i]);
..	..	@@ -4937,6 +5034,10 @@
4937	5034
4938	5035	void paste(boolean expand)
4939	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4940	5041	// if (GrafreeD.clipboard == null)
4941	5042	// return;
4942	5043	boolean first = true;
..	..	@@ -4996,6 +5097,7 @@
4996	5097	Grafreed.clipboard.get(0).parent = keepparent;
4997	5098	}
4998	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4999	5101	ResetModel();
5000	5102	refreshContents();
5001	5103	}
..	..	@@ -5131,6 +5233,10 @@
5131	5233
5132	5234	void group(Object3D csg, boolean grab)
5133	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
5134	5240	if (//false) // why??
5135	5241	!group.selection.isEmpty())
5136	5242	{
..	..	@@ -5244,10 +5350,15 @@
5244	5350	//node.add(csg);
5245	5351	//makeSomething(node);
5246	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
5247	5354	}
5248	5355
5249	5356	void Ungroup(Object3D g)
5250	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
5251	5362	if (g instanceof HiddenObject)
5252	5363	{
5253	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -5264,6 +5375,7 @@
5264	5375	objEditor.makeSomething(g.get(i), false);
5265	5376	}
5266	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
5267	5379	}
5268	5380
5269	5381	void ungroup()
..	..	@@ -5627,7 +5739,7 @@
5627	5739	private MenuItem pasteLinkItem;
5628	5740	private MenuItem pasteCloneItem;
5629	5741	private MenuItem pasteExpandItem;
5630		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5631	5743	private MenuItem clearAllItem;
5632	5744	private MenuItem genUVItem;
5633	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5711,6 +5823,8 @@
5711	5823	private MenuItem attachBumpItem;
5712	5824	private MenuItem detachBumpItem;
5713	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5714	5828
5715	5829	private MenuItem particleItem;
5716	5830	private MenuItem ragdollItem;