~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	}
..	..	@@ -74,6 +80,12 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
77	89	SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +110,7 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
..	..	@@ -220,7 +237,7 @@
220	237	// toggleSwitchItem.addItemListener(this);
221	238	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	239
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	241	toggleHandleItem.addItemListener(this);
225	242	toggleHandleItem.setState(CameraPane.HANDLES);
226	243
..	..	@@ -380,13 +397,14 @@
380	397	shadowYItem.addActionListener(this);
381	398	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
383	403	if (Globals.ADVANCED)
384	404	{
385	405	menu.add("-");
386	406	linkerItem = menu.add(new MenuItem("Linker"));
387	407	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	408	templateItem = menu.add(new MenuItem("Template"));
391	409	templateItem.addActionListener(this);
392	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -538,6 +556,7 @@
538	556	buildToolsMenu(menu);
539	557	}
540	558
	559	+
541	560	void SetupUI2(ObjEditor oe)
542	561	{
543	562	// June 2019
..	..	@@ -582,7 +601,7 @@
582	601	*/
583	602	cGridBag copyOptionsPanel = new cGridBag();
584	603
585		- copyOptionsPanel.preferredHeight = 2;
	604	+ copyOptionsPanel.preferredHeight = 1;
586	605
587	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588	607
..	..	@@ -590,50 +609,66 @@
590	609	//minButton.setToolTipText("Minimize window");
591	610	//minButton.addActionListener(this);
592	611
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
596	618
597	619	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	620	fullButton.setToolTipText("Full-screen window");
599	621	fullButton.addActionListener(this);
600	622
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
601	627	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	628	restoreCameraButton.setToolTipText("Restore viewpoint");
603	629	restoreCameraButton.addActionListener(this);
604	630
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
605	635	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	636	+ undoButton.setToolTipText("Previous version");
607	637	undoButton.addActionListener(this);
608	638	undoButton.setEnabled(false);
609	639
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
610	653	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- redoButton.setToolTipText("Redo changes");
	654	+ redoButton.setToolTipText("Next version");
612	655	redoButton.addActionListener(this);
613	656	redoButton.setEnabled(false);
614	657
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);
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
620	659	liveCB.setToolTipText("Enable animation");
621	660	liveCB.addItemListener(this);
622	661
623		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	663	oneStepButton.setToolTipText("Animate one step forward");
625	664	oneStepButton.addActionListener(this);
626	665
627		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
628	667	fastCB.setToolTipText("Fast mode");
629	668	fastCB.addItemListener(this);
630	669
631	670	//oe.toolboxPanel.Return();
632	671
633		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634		- screenfitButton.setToolTipText("Screen fit");
635		- screenfitButton.addActionListener(this);
636		-
637	672	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
638	673	// trackCB.setToolTipText("Enable tracking");
639	674	// trackCB.addItemListener(this);
..	..	@@ -726,7 +761,7 @@
726	761	compositeButton.addActionListener(this);
727	762
728	763	oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
729		- switchButton.setToolTipText("Create switch");
	764	+ switchButton.setToolTipText("Create item switcher");
730	765	switchButton.addActionListener(this);
731	766
732	767	oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -758,16 +793,16 @@
758	793	}
759	794
760	795	// EDIT panel
761		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
762		- editButton.setToolTipText("Edit selection");
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
763	798	editButton.addActionListener(this);
764	799
765		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
766		- uneditButton.setToolTipText("Unedit selection");
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
767	802	uneditButton.addActionListener(this);
768	803
769	804	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
770		- allParamsButton.setToolTipText("Edit all params");
	805	+ allParamsButton.setToolTipText("Show all controle");
771	806	allParamsButton.addActionListener(this);
772	807
773	808	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -784,6 +819,7 @@
784	819
785	820	editCommandsPanel.preferredHeight = 1;
786	821
	822	+ SetPinStates(false);
787	823	// oe.treePanel.add(commandsPanel);
788	824	// oe.treePanel.Return();
789	825
..	..	@@ -810,6 +846,9 @@
810	846
811	847	oe.treePanel.add(copyOptionsPanel);
812	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
813	852
814	853	// mainPanel.setDividerLocation(0.5); //1.0);
815	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -857,14 +896,18 @@
857	896	boxCB.addItemListener(this);
858	897
859	898	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
860		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
861	900	zoomBoxCB.addItemListener(this);
862	901
863	902	if (true) // Globals.ADVANCED)
864	903	{
865		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
866		- supportCB.setToolTipText("Enable rigging");
867		- supportCB.addItemListener(this);
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
868	911
869	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
870	913	// localCB.addItemListener(this);
..	..	@@ -919,7 +962,7 @@
919	962	oeilCB.addItemListener(this);
920	963
921	964	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
922		- shadowCB.setToolTipText("Compute shadows when live");
	965	+ shadowCB.setToolTipText("When live compute shadows");
923	966	shadowCB.addItemListener(this);
924	967
925	968	panel.Return();
..	..	@@ -928,12 +971,12 @@
928	971	toggleTextureCB.addItemListener(this);
929	972
930	973	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
931		- toggleSwitchCB.setToolTipText("Use switch");
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
932	975	toggleSwitchCB.addItemListener(this);
933	976
934		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
935		- autosaveCB.setToolTipText("Auto-save on structure change");
936		- autosaveCB.addItemListener(this);
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
937	980
938	981	panel.Return();
939	982	if (Globals.ADVANCED)
..	..	@@ -962,7 +1005,7 @@
962	1005	{
963	1006	cRadio radioButton = new cRadio(obj.name);
964	1007
965		- // Patch to avoid bug with transparency.
	1008	+ // June 2019. Patch to avoid bug with transparency.
966	1009	radioButton.hadMaterial = obj.material != null;
967	1010	if (!radioButton.hadMaterial)
968	1011	{
..	..	@@ -999,6 +1042,7 @@
999	1042	cCheckBox slowCB;
1000	1043	cCheckBox boxCB;
1001	1044	cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
1002	1046	//cToggleButton trackCB;
1003	1047	cCheckBox trackCB;
1004	1048	cCheckBox smoothfocusCB;
..	..	@@ -1009,7 +1053,7 @@
1009	1053
1010	1054	cCheckBox oeilCB;
1011	1055	cCheckBox shadowCB;
1012		- cCheckBox autosaveCB;
	1056	+ cCheckBox autokeepCB;
1013	1057	cCheckBox lookAtCB;
1014	1058
1015	1059	// static int COLOR = 1;
..	..	@@ -1117,9 +1161,13 @@
1117	1161	{
1118	1162	Globals.COMPUTESHADOWWHENLIVE ^= true;
1119	1163	}
1120		- else if(e.getSource() == autosaveCB)
	1164	+ else if(e.getSource() == freezeCB)
1121	1165	{
1122		- Globals.SAVEONMAKE ^= true;
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
1123	1171	}
1124	1172	else if(e.getSource() == lookAtCB)
1125	1173	{
..	..	@@ -1201,8 +1249,6 @@
1201	1249	}
1202	1250	}
1203	1251
1204		- String string = (String) object;
1205		-
1206	1252	System.out.println("Transfer = " + object + "; drop : " + target);
1207	1253	// if( object instanceof java.io.File[])
1208	1254	// {
..	..	@@ -1210,6 +1256,8 @@
1210	1256	// objEditor.DropFile((java.io.File[]) object, true);
1211	1257	// return;
1212	1258	// }
	1259	+
	1260	+ String string = object.toString();
1213	1261
1214	1262	// File path for Mac and Windows
1215	1263	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1459,6 +1507,9 @@
1459	1507	animationItem.addItemListener(this);
1460	1508	animationItem.setState(Globals.ANIMATION);
1461	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1462	1513	menu.add("-");
1463	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1464	1515	parseverticesItem.addActionListener(this);
..	..	@@ -1471,6 +1522,8 @@
1471	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1472	1523	reduce34MorphItem.addActionListener(this);
1473	1524	menu.add("-");
	1525	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1526	+ memoryItem.addActionListener(this);
1474	1527	menu.add(computeAOItem = new MenuItem("Compute AO"));
1475	1528	computeAOItem.addActionListener(this);
1476	1529
..	..	@@ -1479,8 +1532,6 @@
1479	1532	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1480	1533	mirrorItem.addActionListener(this);
1481	1534	menu.add("-");
1482		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1483		- memoryItem.addActionListener(this);
1484	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1485	1536	analyzeItem.addActionListener(this);
1486	1537	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1628,6 +1679,20 @@
1628	1679
1629	1680	makeSomething(shadow);
1630	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1631	1696
1632	1697	/**
1633	1698	* applyExample
..	..	@@ -2107,25 +2172,25 @@
2107	2172	Composite csg = new GroupLeaf();
2108	2173	csg.count = 5;
2109	2174	group(csg);
2110		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
2111	2176	csg.addChild(child);
2112	2177	child.addChild(csg);
2113	2178	} else
2114	2179	if (source == doubleItem)
2115	2180	{
2116		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
2117	2182	csg.count = 5;
2118	2183	group(csg);
2119		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
2120	2185	csg.addChild(child);
2121	2186	child.addChild(csg);
2122		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
2123	2188	csg.addChild(child);
2124	2189	child.addChild(csg);
2125	2190	} else
2126	2191	if (source == tripleItem)
2127	2192	{
2128		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
2129	2194	csg.count = 4;
2130	2195	group(csg);
2131	2196	Composite child = new cGroup();
..	..	@@ -2189,15 +2254,31 @@
2189	2254	} else
2190	2255	if (source == undoButton)
2191	2256	{
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2192	2260	Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
2193	2271	} else
2194	2272	if (source == redoButton)
2195	2273	{
	2274	+ // Go to next version
2196	2275	Redo();
2197	2276	} else
2198	2277	if (source == saveButton)
2199	2278	{
2200		- Save();
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
2201	2282	} else
2202	2283	if (source == oneStepButton)
2203	2284	{
..	..	@@ -2206,17 +2287,14 @@
2206	2287	} else
2207	2288	if (source == screenfitButton)
2208	2289	{
2209		- //Reload(lastConverter, lastFilename, true);
2210	2290	ScreenFit();
2211	2291	} else
2212	2292	if (source == screenfitpointButton)
2213	2293	{
2214		- //Reload(lastConverter, lastFilename, true);
2215	2294	ScreenFitPoint();
2216	2295	} else
2217	2296	if (source == snapobjectButton)
2218	2297	{
2219		- //Reload(lastConverter, lastFilename, true);
2220	2298	SnapObject();
2221	2299	} else
2222	2300	// if (event.getSource() == recompileButton)
..	..	@@ -2740,15 +2818,28 @@
2740	2818	} else
2741	2819	if (source == ungroupItem \|\| source == ungroupButton)
2742	2820	{
2743		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2744	2823	for (int i=0; i<group.selection.size(); i++)
2745	2824	{
2746		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2747	2830	}
2748	2831
2749		- ClearSelection(false);
2750		-
2751		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2752	2843	} else
2753	2844	if (source == genUVItem)
2754	2845	{
..	..	@@ -3372,7 +3463,7 @@
3372	3463	//copy.ClearUI();
3373	3464	for (Object3D obj : listUI)
3374	3465	{
3375		- obj.pinned = true;
	3466	+ obj.pinned = false;
3376	3467	obj.CloseUI();
3377	3468	}
3378	3469	listUI.clear();
..	..	@@ -3431,6 +3522,9 @@
3431	3522	}
3432	3523
3433	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
3434	3528	//Globals.theRenderer.object = group;
3435	3529	if(!useclient)
3436	3530	{
..	..	@@ -3457,6 +3551,13 @@
3457	3551	currentLayout = sevenButton;
3458	3552	*/
3459	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
3460	3561	keepparent = group.parent;
3461	3562	// PARENT = NULL or not???
3462	3563	//group.parent = null; // ROOT
..	..	@@ -4616,17 +4717,7 @@
4616	4717	//new Exception().printStackTrace();
4617	4718
4618	4719	freezemodel = true;
4619		-
4620		- //for (Object3D obj : listUI)
4621		- for (int i=listUI.size(); --i>=0;)
4622		- {
4623		- Object3D obj = listUI.elementAt(i);
4624		- if (!obj.pinned)
4625		- {
4626		- obj.CloseUI();
4627		- listUI.remove(i);
4628		- }
4629		- }
	4720	+ ClearUnpinned();
4630	4721
4631	4722	/**/
4632	4723	//switch (event.id)
..	..	@@ -4689,12 +4780,14 @@
4689	4780	{
4690	4781	editButton.setEnabled(enabled);
4691	4782	uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
4692	4785	}
4693	4786
4694	4787	void refreshContents(boolean cp)
4695	4788	{
4696	4789	if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4697		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4698	4791	{
4699	4792	objEditor.ClearInfo(); // .GetMaterial());
4700	4793
..	..	@@ -4793,8 +4886,8 @@
4793	4886
4794	4887	if (cut)
4795	4888	{
4796		- if (Globals.SAVEONMAKE)
4797		- Save();
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4798	4891	//int indices[] = jList.getSelectedIndices();
4799	4892	//for (int i = indices.length - 1; i >= 0; i--)
4800	4893	//jList.remove(indices[i]);
..	..	@@ -4897,6 +4990,10 @@
4897	4990
4898	4991	void paste(boolean expand)
4899	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4900	4997	// if (GrafreeD.clipboard == null)
4901	4998	// return;
4902	4999	boolean first = true;
..	..	@@ -4956,6 +5053,7 @@
4956	5053	Grafreed.clipboard.get(0).parent = keepparent;
4957	5054	}
4958	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4959	5057	ResetModel();
4960	5058	refreshContents();
4961	5059	}
..	..	@@ -5091,6 +5189,10 @@
5091	5189
5092	5190	void group(Object3D csg, boolean grab)
5093	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
5094	5196	if (//false) // why??
5095	5197	!group.selection.isEmpty())
5096	5198	{
..	..	@@ -5204,10 +5306,15 @@
5204	5306	//node.add(csg);
5205	5307	//makeSomething(node);
5206	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
5207	5310	}
5208	5311
5209	5312	void Ungroup(Object3D g)
5210	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
5211	5318	if (g instanceof HiddenObject)
5212	5319	{
5213	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -5224,6 +5331,7 @@
5224	5331	objEditor.makeSomething(g.get(i), false);
5225	5332	}
5226	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
5227	5335	}
5228	5336
5229	5337	void ungroup()
..	..	@@ -5514,9 +5622,6 @@
5514	5622
5515	5623	cButton restoreCameraButton;
5516	5624
5517		- cButton minButton;
5518		- cButton maxButton;
5519		- cButton fullButton;
5520	5625	cButton saveButton;
5521	5626	cButton oneStepButton;
5522	5627