~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -23,6 +24,314 @@
23	24	DragGestureListener, DragSourceListener, DropTargetListener,
24	25	ItemListener // ListSelectionListener
25	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	46	+ {
	47	+ cGridBag tab0 = new cGridBag().setVertical(true);
	48	+
	49	+ tab0.setName("Urban");
	50	+ skyboxpanel.add(tab0);
	51	+
	52	+ cGridBag row0 = new cGridBag();
	53	+ cGridBag row1 = new cGridBag();
	54	+ cGridBag row2 = new cGridBag();
	55	+ cGridBag row3 = new cGridBag();
	56	+ cGridBag row4 = new cGridBag();
	57	+ cGridBag row5 = new cGridBag();
	58	+ cGridBag row6 = new cGridBag();
	59	+
	60	+ AddSkyboxButton("default", "rgb", row0);
	61	+ //AddSkyboxButton("default", "cornell", row0);
	62	+ AddSkyboxButton("penguins", "dust", row0);
	63	+ AddSkyboxButton("penguins", "tropic", row0);
	64	+ AddSkyboxButton("penguins", "yonder", row0);
	65	+
	66	+ AddSkyboxButton("default", "uffizi", row1);
	67	+ AddSkyboxButton("bridge", "Bridge", row1);
	68	+ AddSkyboxButton("bridge", "Bridge2", row1);
	69	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	70	+
	71	+ AddSkyboxButton("urban", "Parliament", row2);
	72	+ AddSkyboxButton("urban", "Roundabout", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	75	+
	76	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	77	+ AddSkyboxButton("urban", "UnionSquare", row3);
	78	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	79	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	80	+
	81	+ AddSkyboxButton("park", "Buddha", row4);
	82	+ AddSkyboxButton("park", "CNTower2", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	84	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	85	+
	86	+ AddSkyboxButton("park", "Park", row5);
	87	+ AddSkyboxButton("park", "Pond", row5);
	88	+ AddSkyboxButton("park", "Skansen", row5);
	89	+ AddSkyboxButton("park", "Skansen2", row5);
	90	+
	91	+ AddSkyboxButton("park", "Skansen3", row6);
	92	+ AddSkyboxButton("park", "Skansen4", row6);
	93	+ AddSkyboxButton("park", "Skansen5", row6);
	94	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	95	+
	96	+ tab0.add(row0);
	97	+ tab0.add(row1);
	98	+ tab0.add(row2);
	99	+ tab0.add(row3);
	100	+ tab0.add(row4);
	101	+ tab0.add(row5);
	102	+ tab0.add(row6);
	103	+
	104	+ for (int i=5; --i>=0;)
	105	+ {
	106	+ //oe.toolboxPanel.Return();
	107	+ //tab0.add(new cGridBag());
	108	+ }
	109	+ }
	110	+
	111	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	112	+ {
	113	+ cGridBag tab0 = new cGridBag().setVertical(true);
	114	+
	115	+ tab0.setName("Nature");
	116	+ skyboxpanel.add(tab0);
	117	+
	118	+ cGridBag row0 = new cGridBag();
	119	+ cGridBag row1 = new cGridBag();
	120	+ cGridBag row2 = new cGridBag();
	121	+ cGridBag row3 = new cGridBag();
	122	+ cGridBag row4 = new cGridBag();
	123	+ cGridBag row5 = new cGridBag();
	124	+ cGridBag row6 = new cGridBag();
	125	+
	126	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	127	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	128	+ AddSkyboxButton("beach", "PalmTrees", row0);
	129	+ AddSkyboxButton("beach", "Tenerife", row0);
	130	+
	131	+ AddSkyboxButton("beach", "Tenerife2", row1);
	132	+ AddSkyboxButton("beach", "Tenerife3", row1);
	133	+ AddSkyboxButton("field", "FishPond", row1);
	134	+ AddSkyboxButton("field", "Footballfield", row1);
	135	+
	136	+ AddSkyboxButton("field", "Meadow", row2);
	137	+ AddSkyboxButton("field", "Sorsele", row2);
	138	+ AddSkyboxButton("field", "Sorsele2", row2);
	139	+ AddSkyboxButton("field", "Sorsele3", row2);
	140	+
	141	+ AddSkyboxButton("forest", "Brudslojan", row3);
	142	+ AddSkyboxButton("forest", "Langholmen2", row3);
	143	+ AddSkyboxButton("forest", "Plants", row3);
	144	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	145	+
	146	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	147	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	148	+ AddSkyboxButton("mountain", "Teide", row4);
	149	+ AddSkyboxButton("park", "Tantolunden4", row4);
	150	+
	151	+ AddSkyboxButton("park", "Stairs", row5);
	152	+ AddSkyboxButton("default", "skycube", row6);
	153	+ AddSkyboxButton("rocky", "Langholmen", row5);
	154	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	155	+
	156	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	157	+ AddSkyboxButton("default", "CloudyHills", row6);
	158	+ AddSkyboxButton("daz", "Autumn", row6);
	159	+ AddSkyboxButton("daz", "MountainTrail", row6);
	160	+ /*
	161	+Autumn
	162	+Greenlands
	163	+MountainTrail
	164	+Oasis
	165	+TheRock
	166	+TopOfTheWorld
	167	+Winter
	168	+ */
	169	+
	170	+ tab0.add(row0);
	171	+ tab0.add(row1);
	172	+ tab0.add(row2);
	173	+ tab0.add(row3);
	174	+ tab0.add(row4);
	175	+ tab0.add(row5);
	176	+ tab0.add(row6);
	177	+
	178	+ for (int i=5; --i>=0;)
	179	+ {
	180	+ //oe.toolboxPanel.Return();
	181	+ //tab0.add(new cGridBag());
	182	+ }
	183	+ }
	184	+
	185	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	186	+ {
	187	+ cGridBag tab0 = new cGridBag().setVertical(true);
	188	+
	189	+ tab0.setName("Night");
	190	+ skyboxpanel.add(tab0);
	191	+
	192	+ cGridBag row0 = new cGridBag();
	193	+ cGridBag row1 = new cGridBag();
	194	+ cGridBag row2 = new cGridBag();
	195	+ cGridBag row3 = new cGridBag();
	196	+ cGridBag row4 = new cGridBag();
	197	+ cGridBag row5 = new cGridBag();
	198	+ cGridBag row6 = new cGridBag();
	199	+
	200	+ AddSkyboxButton("night", "NightPath", row0);
	201	+ AddSkyboxButton("night", "PondNight", row0);
	202	+ AddSkyboxButton("night", "Powerlines", row0);
	203	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	204	+
	205	+ AddSkyboxButton("urban", "CNTower", row1);
	206	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	207	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	208	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	209	+
	210	+ AddSkyboxButton("penguins", "kenon_star", row2);
	211	+ AddSkyboxButton("persson", "corona", row2);
	212	+ AddSkyboxButton("persson", "spaceskybox", row2);
	213	+ AddSkyboxButton("indoors", "Vasa", row2);
	214	+
	215	+ AddSkyboxButton("winter", "Backyard", row3);
	216	+ AddSkyboxButton("winter", "Creek", row3);
	217	+ AddSkyboxButton("winter", "FootballField3", row3);
	218	+ AddSkyboxButton("winter", "Forest", row3);
	219	+
	220	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	221	+ AddSkyboxButton("winter", "House", row4);
	222	+ AddSkyboxButton("winter", "IceLake", row4);
	223	+ AddSkyboxButton("winter", "IceRiver", row4);
	224	+
	225	+ AddSkyboxButton("winter", "Park3", row5);
	226	+ AddSkyboxButton("winter", "PondWinter", row5);
	227	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	228	+ AddSkyboxButton("winter", "Vindelalven", row5);
	229	+
	230	+ AddSkyboxButton("daz", "TheRock", row6);
	231	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	232	+ AddSkyboxButton("daz", "Winter", row6);
	233	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	234	+
	235	+ tab0.add(row0);
	236	+ tab0.add(row1);
	237	+ tab0.add(row2);
	238	+ tab0.add(row3);
	239	+ tab0.add(row4);
	240	+ tab0.add(row5);
	241	+ tab0.add(row6);
	242	+
	243	+ for (int i=5; --i>=0;)
	244	+ {
	245	+ //oe.toolboxPanel.Return();
	246	+ //tab0.add(new cGridBag());
	247	+ }
	248	+ }
	249	+
	250	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	251	+ {
	252	+ cGridBag tab0 = new cGridBag().setVertical(true);
	253	+
	254	+ tab0.setName("Others");
	255	+ skyboxpanel.add(tab0);
	256	+
	257	+ cGridBag row0 = new cGridBag();
	258	+ cGridBag row1 = new cGridBag();
	259	+ cGridBag row2 = new cGridBag();
	260	+ cGridBag row3 = new cGridBag();
	261	+ cGridBag row4 = new cGridBag();
	262	+ cGridBag row5 = new cGridBag();
	263	+ cGridBag row6 = new cGridBag();
	264	+
	265	+ AddSkyboxButton("mayhem", "afterrain", row0);
	266	+ AddSkyboxButton("mayhem", "aqua4", row0);
	267	+ AddSkyboxButton("mayhem", "aqua9", row0);
	268	+ AddSkyboxButton("mayhem", "flame", row0);
	269	+
	270	+ AddSkyboxButton("mayhem", "h2s", row1);
	271	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	272	+ AddSkyboxButton("mayhem", "scorched", row1);
	273	+ AddSkyboxButton("penguins", "desertdawn", row1);
	274	+
	275	+ AddSkyboxButton("persson", "Citadella", row2);
	276	+ AddSkyboxButton("persson", "Citadella2", row2);
	277	+ AddSkyboxButton("persson", "clouds1", row2);
	278	+ AddSkyboxButton("penguins", "wrath", row2);
	279	+
	280	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	281	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	282	+ AddSkyboxButton("indoors", "DallasW", row3);
	283	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	284	+
	285	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	287	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	288	+ AddSkyboxButton("persson", "redeclipse", row4);
	289	+
	290	+ AddSkyboxButton("daz", "Greenlands", row5);
	291	+ AddSkyboxButton("daz", "Oasis", row5);
	292	+ AddSkyboxButton("elyvisions", "arch3", row5);
	293	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	294	+
	295	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	296	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	297	+ AddSkyboxButton("elyvisions", "heaven", row6);
	298	+ AddSkyboxButton("elyvisions", "hot", row6);
	299	+
	300	+ tab0.add(row0);
	301	+ tab0.add(row1);
	302	+ tab0.add(row2);
	303	+ tab0.add(row3);
	304	+ tab0.add(row4);
	305	+ tab0.add(row5);
	306	+ tab0.add(row6);
	307	+
	308	+ for (int i=5; --i>=0;)
	309	+ {
	310	+ //oe.toolboxPanel.Return();
	311	+ //tab0.add(new cGridBag());
	312	+ }
	313	+ }
	314	+
	315	+ public void CallBack(String[] path)
	316	+ {
	317	+ for (int i = 0; i < path.length; i++)
	318	+ {
	319	+ System.out.print(path[i] + "/");
	320	+ }
	321	+
	322	+ System.out.println();
	323	+ }
	324	+
	325	+ public void ChangeSkybox(String skybox)
	326	+ {
	327	+ //cameraView.envyoff = false;
	328	+ group.skyboxname = skybox;
	329	+ group.skyboxext = "jpg";
	330	+ cameraView.repaint();
	331	+
	332	+ Grafreed.ParseResources("textures", this);
	333	+ }
	334	+
26	335	//ObjEditor objEditor;
27	336	public void closeUI2()
28	337	{
..	..	@@ -60,6 +369,12 @@
60	369	this.copy = this.group = group;
61	370	//selectees = this.group.selectees;
62	371
	372	+ if (copy.versionlist == null)
	373	+ {
	374	+ copy.versionlist = new Object3D[100];
	375	+ copy.versionindex = -1;
	376	+ }
	377	+
63	378	if(ui)
64	379	SetupUI(objEditor);
65	380	}
..	..	@@ -80,10 +395,22 @@
80	395	SetupViews(objEditor);
81	396
82	397	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	398	+
	399	+ if (copy.versionlist == null)
	400	+ {
	401	+ copy.versionlist = new Object3D[100];
	402	+ copy.versionindex = -1;
	403	+
	404	+ Save(true);
	405	+ }
83	406	}
84	407
85	408	void CloneSelection(boolean supports)
86	409	{
	410	+ if (Globals.REPLACEONMAKE)
	411	+ Save();
	412	+ boolean keep = Globals.REPLACEONMAKE;
	413	+ Globals.REPLACEONMAKE = false;
87	414	// Object3D keep = GrafreeD.clipboard;
88	415	//Object3D obj;
89	416	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +421,7 @@
94	421
95	422	makeSomething(clone, i==group.selection.size()-1);
96	423	}
	424	+ Globals.REPLACEONMAKE = keep;
97	425	}
98	426
99	427	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +517,8 @@
189	517	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	518	// pasteExpandItem.addActionListener(this);
191	519	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	520	+ deleteItem = menu.add(new MenuItem("Delete"));
	521	+ deleteItem.addActionListener(this);
194	522
195	523	if (Globals.ADVANCED)
196	524	{
..	..	@@ -220,7 +548,7 @@
220	548	// toggleSwitchItem.addItemListener(this);
221	549	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	550
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	551	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	552	toggleHandleItem.addItemListener(this);
225	553	toggleHandleItem.setState(CameraPane.HANDLES);
226	554
..	..	@@ -380,13 +708,14 @@
380	708	shadowYItem.addActionListener(this);
381	709	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	710	shadowZItem.addActionListener(this);
	711	+ attributeItem = menu.add(new MenuItem("Attribute"));
	712	+ attributeItem.addActionListener(this);
	713	+
383	714	if (Globals.ADVANCED)
384	715	{
385	716	menu.add("-");
386	717	linkerItem = menu.add(new MenuItem("Linker"));
387	718	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	719	templateItem = menu.add(new MenuItem("Template"));
391	720	templateItem.addActionListener(this);
392	721	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +744,7 @@
415	744	genNormalsMESHItem.addActionListener(this);
416	745	if (Globals.ADVANCED)
417	746	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	747	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	748	genNormalsMINEItem.addActionListener(this);
420	749	}
421	750	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +837,15 @@
508	837	attachBumpItem.addActionListener(this);
509	838	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	839	pigmentBumpItem.addActionListener(this);
	840	+ //embedTexturesItem
511	841	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	842	detachPigmentItem.addActionListener(this);
513	843	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	844	detachBumpItem.addActionListener(this);
	845	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	846	+ embedTexturesItem.addActionListener(this);
	847	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	848	+ deEmbedTexturesItem.addActionListener(this);
515	849	menu.add("-");
516	850	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	851	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +872,7 @@
538	872	buildToolsMenu(menu);
539	873	}
540	874
	875	+
541	876	void SetupUI2(ObjEditor oe)
542	877	{
543	878	// June 2019
..	..	@@ -590,48 +925,70 @@
590	925	//minButton.setToolTipText("Minimize window");
591	926	//minButton.addActionListener(this);
592	927
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ maxButton.setToolTipText("Maximize window");
	932	+ maxButton.addActionListener(this);
	933	+ }
596	934
597	935	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	936	fullButton.setToolTipText("Full-screen window");
599	937	fullButton.addActionListener(this);
600	938
	939	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	940	+ screenfitButton.setToolTipText("Screen fit");
	941	+ screenfitButton.addActionListener(this);
	942	+
601	943	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	944	restoreCameraButton.setToolTipText("Restore viewpoint");
603	945	restoreCameraButton.addActionListener(this);
604	946
605		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
607		- undoButton.addActionListener(this);
	947	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	948	+ saveVersionButton.setToolTipText("Duplicate current version");
	949	+ saveVersionButton.addActionListener(this);
	950	+
	951	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	952	+ deleteVersionButton.setToolTipText("Delete current version");
	953	+ deleteVersionButton.addActionListener(this);
	954	+
	955	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	956	+ previousVersionButton.setToolTipText("Previous version");
	957	+ previousVersionButton.addActionListener(this);
	958	+ previousVersionButton.setEnabled(false);
608	959
609		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
611		- redoButton.addActionListener(this);
	960	+ cGridBag updown = new cGridBag().setVertical(true);
	961	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	962	+ restoreButton.setToolTipText("Undo (restore current version)");
	963	+ restoreButton.addActionListener(this);
	964	+ //restoreButton.setEnabled(false);
612	965
613		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- saveButton.setToolTipText("Save changes");
615		- saveButton.addActionListener(this);
	966	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	967	+ replaceButton.setToolTipText("Save (replace current version)");
	968	+ replaceButton.addActionListener(this);
	969	+ //replaceButton.setEnabled(false);
616	970
617		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	971	+ copyOptionsPanel.add(updown);
	972	+
	973	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	974	+ nextVersionButton.setToolTipText("Next version");
	975	+ nextVersionButton.addActionListener(this);
	976	+ nextVersionButton.setEnabled(false);
	977	+
	978	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618	979	liveCB.setToolTipText("Enable animation");
619	980	liveCB.addItemListener(this);
620	981
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	982	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	983	oneStepButton.setToolTipText("Animate one step forward");
623	984	oneStepButton.addActionListener(this);
624	985
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	986	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	987	fastCB.setToolTipText("Fast mode");
627	988	fastCB.addItemListener(this);
628	989
629	990	//oe.toolboxPanel.Return();
630	991
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	992	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	993	// trackCB.setToolTipText("Enable tracking");
637	994	// trackCB.addItemListener(this);
..	..	@@ -644,31 +1001,32 @@
644	1001	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645	1002	snapobjectButton.addActionListener(this);
646	1003	snapobjectButton.setToolTipText("Snap Object");
	1004	+
	1005	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1006	+ fourButton.addActionListener(this);
	1007	+ fourButton.setToolTipText("Show control panel only");
647	1008	}
648	1009
649	1010	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	1011
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
	1012	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1013	+ twoButton.setToolTipText("Show 3D view only");
653	1014	twoButton.addActionListener(this);
654	1015	this.fullscreenLayout = twoButton;
655	1016
656		- oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657		- fourButton.addActionListener(this);
658		- fourButton.setToolTipText("Show left panel only");
659		- oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660		- sixButton.setToolTipText("2-column layout left");
661		- sixButton.addActionListener(this);
662		- oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663		- threeButton.setToolTipText("2-column layout right");
	1017	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1018	+ threeButton.setToolTipText("Show controls and 3D view");
664	1019	threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
	1020	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1021	+ sixButton.setToolTipText("Show 3D view and controls");
	1022	+ sixButton.addActionListener(this);
	1023	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1024	+// sevenButton.setToolTipText("3-column layout");
	1025	+// sevenButton.addActionListener(this);
668	1026	//
669	1027
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	1028	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ rootButton.setToolTipText("Open selection in new tab");
672	1030	rootButton.addActionListener(this);
673	1031
674	1032	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -677,28 +1035,30 @@
677	1035	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678	1036	//clearButton.addActionListener(this);
679	1037
	1038	+ cGridBag row1 = new cGridBag();
	1039	+
680	1040	// INSERT
681		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	1042	gridButton.setToolTipText("Create grid");
683	1043	gridButton.addActionListener(this);
684	1044
685		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	1046	boxButton.setToolTipText("Create box");
687	1047	boxButton.addActionListener(this);
688	1048
689		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690	1050	sphereButton.setToolTipText("Create sphere");
691	1051	sphereButton.addActionListener(this);
692	1052
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1053	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	1054	coneButton.setToolTipText("Create cone");
695	1055	coneButton.addActionListener(this);
696	1056
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1057	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	1058	torusButton.setToolTipText("Create torus");
699	1059	torusButton.addActionListener(this);
700	1060
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	1062	superButton.setToolTipText("Create superellipsoid");
703	1063	superButton.addActionListener(this);
704	1064
..	..	@@ -709,60 +1069,78 @@
709	1069	kleinButton.addActionListener(this);
710	1070	}
711	1071
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	1073	particlesButton.setToolTipText("Create particle system");
714	1074	particlesButton.addActionListener(this);
715	1075
716		- oe.toolboxPanel.Return();
	1076	+ oe.toolboxPanel.add(row1);
717	1077
718		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1078	+ cGridBag row2 = new cGridBag();
	1079	+
	1080	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	1081	groupButton.setToolTipText("Create group");
720	1082	groupButton.addActionListener(this);
721	1083
722		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	1085	compositeButton.setToolTipText("Create composite");
724	1086	compositeButton.addActionListener(this);
725	1087
726		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	1088	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ switchButton.setToolTipText("Create item switcher");
728	1090	switchButton.addActionListener(this);
729	1091
730		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1092	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	1093	loopButton.setToolTipText("Create loop");
732	1094	loopButton.addActionListener(this);
733	1095
734		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1096	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	1097	textureButton.setToolTipText("Create texture");
736	1098	textureButton.addActionListener(this);
737	1099
738		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1100	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	1101	overlayButton.setToolTipText("Create overlay");
740	1102	overlayButton.addActionListener(this);
741	1103
742		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	1105	lightButton.setToolTipText("Create light");
744	1106	lightButton.addActionListener(this);
745	1107
	1108	+ oe.toolboxPanel.add(row2);
	1109	+
	1110	+ // ENVYMAPS
	1111	+ cGridBag skyboxpane = new cGridBag();
	1112	+ skyboxpane.preferredHeight = 100;
	1113	+
	1114	+ oe.skyboxPanel.add(skyboxpane);
	1115	+
	1116	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1117	+ skyboxpane.add(skyboxpanel);
	1118	+
	1119	+ AddSkyboxTab0(skyboxpanel);
	1120	+ AddSkyboxTab1(skyboxpanel);
	1121	+ AddSkyboxTab2(skyboxpanel);
	1122	+ AddSkyboxTab3(skyboxpanel);
	1123	+
746	1124	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	1125	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ editButton.setToolTipText("Pin selection controls");
749	1127	editButton.addActionListener(this);
750	1128
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	1129	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ uneditButton.setToolTipText("Unpin and remove selection controls");
753	1131	uneditButton.addActionListener(this);
754	1132
755	1133	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	1134	+ allParamsButton.setToolTipText("Show all controle");
757	1135	allParamsButton.addActionListener(this);
758	1136
759		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1137	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760	1138	clearPanelButton.setToolTipText("Clear edit panel");
761	1139	clearPanelButton.addActionListener(this);
762	1140
763		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764		- unselectButton.setToolTipText("Unselect");
765		- unselectButton.addActionListener(this);
	1141	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ //unselectButton.setToolTipText("Unselect");
	1143	+ //unselectButton.addActionListener(this);
766	1144
767	1145	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768	1146	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -770,6 +1148,7 @@
770	1148
771	1149	editCommandsPanel.preferredHeight = 1;
772	1150
	1151	+ SetPinStates(false);
773	1152	// oe.treePanel.add(commandsPanel);
774	1153	// oe.treePanel.Return();
775	1154
..	..	@@ -796,9 +1175,12 @@
796	1175
797	1176	oe.treePanel.add(copyOptionsPanel);
798	1177	oe.treePanel.Return();
	1178	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1179	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1180	+ sliderPane.preferredHeight = 1;
799	1181
800		-// mainPanel.setDividerLocation(0.5); //1.0);
801		-// mainPanel.setResizeWeight(0.5);
	1182	+// mainPanel.setDividerLocation(0.1); //1.0);
	1183	+ mainPanel.setResizeWeight(0.4);
802	1184
803	1185	//jList.addListSelectionListener(this);
804	1186	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -806,7 +1188,7 @@
806	1188	//jTree.setEditable(true);
807	1189	oe.jTree.setDragEnabled(true);
808	1190	//jTree.setPreferredSize(new Dimension(10,10));
809		- jSP.setPreferredSize(new Dimension(100,200));
	1191	+ //jSP.setPreferredSize(new Dimension(100,200));
810	1192
811	1193	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812	1194
..	..	@@ -818,7 +1200,7 @@
818	1200	dgr.addDragGestureListener(this);
819	1201	}catch(Exception e) {}
820	1202	*/
821		- radio.layout = sevenButton;
	1203	+ radio.layout = threeButton; // sixButton;
822	1204	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	1205	}
824	1206
..	..	@@ -843,14 +1225,18 @@
843	1225	boxCB.addItemListener(this);
844	1226
845	1227	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1228	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	1229	zoomBoxCB.addItemListener(this);
848	1230
849	1231	if (true) // Globals.ADVANCED)
850	1232	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	1233	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1234	+// supportCB.setToolTipText("Enable rigging");
	1235	+// supportCB.addItemListener(this);
	1236	+
	1237	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1238	+ freezeCB.setToolTipText("Fast moving camera");
	1239	+ freezeCB.addItemListener(this);
854	1240
855	1241	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	1242	// localCB.addItemListener(this);
..	..	@@ -865,9 +1251,12 @@
865	1251	smoothCB.setToolTipText("Snapping delay");
866	1252	smoothCB.addItemListener(this);
867	1253
868		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
869		- slowCB.setToolTipText("Smooth interpolation");
870		- slowCB.addItemListener(this);
	1254	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1255	+// slowCB.setToolTipText("Smooth interpolation");
	1256	+// slowCB.addItemListener(this);
	1257	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1258	+ minshaderCB.setToolTipText("Minimal fast shader");
	1259	+ minshaderCB.addItemListener(this);
871	1260
872	1261	// constraints.gridy += 1;
873	1262	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -905,7 +1294,7 @@
905	1294	oeilCB.addItemListener(this);
906	1295
907	1296	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	1297	+ shadowCB.setToolTipText("When live compute shadows");
909	1298	shadowCB.addItemListener(this);
910	1299
911	1300	panel.Return();
..	..	@@ -914,12 +1303,12 @@
914	1303	toggleTextureCB.addItemListener(this);
915	1304
916	1305	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	1306	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	1307	toggleSwitchCB.addItemListener(this);
919	1308
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	1309	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1310	+ autokeepCB.setToolTipText("On structure change");
	1311	+ autokeepCB.addItemListener(this);
923	1312
924	1313	panel.Return();
925	1314	if (Globals.ADVANCED)
..	..	@@ -948,7 +1337,7 @@
948	1337	{
949	1338	cRadio radioButton = new cRadio(obj.name);
950	1339
951		- // Patch to avoid bug with transparency.
	1340	+ // June 2019. Patch to avoid bug with transparency.
952	1341	radioButton.hadMaterial = obj.material != null;
953	1342	if (!radioButton.hadMaterial)
954	1343	{
..	..	@@ -956,7 +1345,7 @@
956	1345	}
957	1346
958	1347	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1348	+ radioButton.layout = threeButton; // sixButton;
960	1349	radioButton.SetCamera(cameraView.renderCamera, false);
961	1350	radioButton.addActionListener(this);
962	1351	radioPanel.add(radioButton);
..	..	@@ -981,10 +1370,13 @@
981	1370	cCheckBox localCB;
982	1371	cCheckBox crowdCB;
983	1372	cCheckBox smoothCB;
	1373	+ cCheckBox minshaderCB;
	1374	+
984	1375	cToggleButton fastCB;
985	1376	cCheckBox slowCB;
986	1377	cCheckBox boxCB;
987	1378	cCheckBox zoomBoxCB;
	1379	+ cCheckBox freezeCB;
988	1380	//cToggleButton trackCB;
989	1381	cCheckBox trackCB;
990	1382	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1387,7 @@
995	1387
996	1388	cCheckBox oeilCB;
997	1389	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1390	+ cCheckBox autokeepCB;
999	1391	cCheckBox lookAtCB;
1000	1392
1001	1393	// static int COLOR = 1;
..	..	@@ -1051,6 +1443,12 @@
1051	1443	cameraView.ToggleInertia();
1052	1444	cameraView.repaint();
1053	1445	}
	1446	+ else if(e.getSource() == minshaderCB)
	1447	+ {
	1448	+ Globals.MINSHADER ^= true;
	1449	+ cameraView.programInitialized = false;
	1450	+ cameraView.repaint();
	1451	+ }
1054	1452	else if(e.getSource() == localCB)
1055	1453	{
1056	1454	cameraView.ToggleLocal();
..	..	@@ -1103,9 +1501,13 @@
1103	1501	{
1104	1502	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1503	}
1106		- else if(e.getSource() == autosaveCB)
	1504	+ else if(e.getSource() == freezeCB)
1107	1505	{
1108		- Globals.SAVEONMAKE ^= true;
	1506	+ Globals.FREEZEONMOVE ^= true;
	1507	+ }
	1508	+ else if(e.getSource() == autokeepCB)
	1509	+ {
	1510	+ Globals.REPLACEONMAKE ^= true;
1109	1511	}
1110	1512	else if(e.getSource() == lookAtCB)
1111	1513	{
..	..	@@ -1187,8 +1589,6 @@
1187	1589	}
1188	1590	}
1189	1591
1190		- String string = (String) object;
1191		-
1192	1592	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1593	// if( object instanceof java.io.File[])
1194	1594	// {
..	..	@@ -1196,6 +1596,8 @@
1196	1596	// objEditor.DropFile((java.io.File[]) object, true);
1197	1597	// return;
1198	1598	// }
	1599	+
	1600	+ String string = object.toString();
1199	1601
1200	1602	// File path for Mac and Windows
1201	1603	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1445,6 +1847,9 @@
1445	1847	animationItem.addItemListener(this);
1446	1848	animationItem.setState(Globals.ANIMATION);
1447	1849
	1850	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1851	+ archiveItem.addActionListener(this);
	1852	+
1448	1853	menu.add("-");
1449	1854	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1855	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +1862,8 @@
1457	1862	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	1863	reduce34MorphItem.addActionListener(this);
1459	1864	menu.add("-");
	1865	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1866	+ memoryItem.addActionListener(this);
1460	1867	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	1868	computeAOItem.addActionListener(this);
1462	1869
..	..	@@ -1465,8 +1872,6 @@
1465	1872	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	1873	mirrorItem.addActionListener(this);
1467	1874	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	1875	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	1876	analyzeItem.addActionListener(this);
1472	1877	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +2019,30 @@
1614	2019
1615	2020	makeSomething(shadow);
1616	2021	}
	2022	+
	2023	+ private void ClearUnpinned()
	2024	+ {
	2025	+ //for (Object3D obj : listUI)
	2026	+ for (int i=listUI.size(); --i>=0;)
	2027	+ {
	2028	+ Object3D obj = listUI.elementAt(i);
	2029	+ if (!obj.pinned)
	2030	+ {
	2031	+ obj.CloseUI();
	2032	+ listUI.remove(i);
	2033	+ }
	2034	+ }
	2035	+ }
	2036	+
	2037	+ private void EditElement(Object3D elem, boolean newWindow)
	2038	+ {
	2039	+ // if (!(elem instanceof Composite))
	2040	+ // newWindow = false;
	2041	+ listUI.add(elem);
	2042	+ elem.openEditWindow(this, newWindow); //, false);
	2043	+ System.out.println("edit : " + elem);
	2044	+ elem.editWindow.refreshContents(true); // ? new
	2045	+ }
1617	2046
1618	2047	/**
1619	2048	* applyExample
..	..	@@ -2042,6 +2471,23 @@
2042	2471	{
2043	2472	makeSomething(new Light());
2044	2473	} else
	2474	+// if (source == skybox1Button \|\|
	2475	+// source == skybox2Button \|\|
	2476	+// source == skybox3Button \|\|
	2477	+// source == skybox4Button \|\|
	2478	+// source == skybox5Button \|\|
	2479	+// source == skybox6Button \|\|
	2480	+// source == skybox7Button \|\|
	2481	+// source == skybox11Button \|\|
	2482	+// source == skybox12Button \|\|
	2483	+// source == skybox13Button \|\|
	2484	+// source == skybox14Button \|\|
	2485	+// source == skybox15Button \|\|
	2486	+// source == skybox16Button \|\|
	2487	+// source == skybox17Button)
	2488	+// {
	2489	+// ChangeSkybox(source);
	2490	+// } else
2045	2491	if (source == csgItem)
2046	2492	{
2047	2493	group(new CSG());
..	..	@@ -2093,25 +2539,25 @@
2093	2539	Composite csg = new GroupLeaf();
2094	2540	csg.count = 5;
2095	2541	group(csg);
2096		- Composite child = new cGroup();
	2542	+ Composite child = new cGroup("Branch");
2097	2543	csg.addChild(child);
2098	2544	child.addChild(csg);
2099	2545	} else
2100	2546	if (source == doubleItem)
2101	2547	{
2102		- Composite csg = new GroupLeaf();
	2548	+ Composite csg = new GroupLeaf("Fork");
2103	2549	csg.count = 5;
2104	2550	group(csg);
2105		- Composite child = new cGroup();
	2551	+ Composite child = new cGroup("Branch A");
2106	2552	csg.addChild(child);
2107	2553	child.addChild(csg);
2108		- child = new cGroup();
	2554	+ child = new cGroup("Branch B");
2109	2555	csg.addChild(child);
2110	2556	child.addChild(csg);
2111	2557	} else
2112	2558	if (source == tripleItem)
2113	2559	{
2114		- Composite csg = new GroupLeaf();
	2560	+ Composite csg = new GroupLeaf("Trident");
2115	2561	csg.count = 4;
2116	2562	group(csg);
2117	2563	Composite child = new cGroup();
..	..	@@ -2127,7 +2573,7 @@
2127	2573	if (source == computeAOItem)
2128	2574	{
2129	2575	Globals.drawMode = CameraPane.OCCLUSION;
2130		- Globals.theRenderer.repaint();
	2576	+ cameraView.repaint();
2131	2577	} else
2132	2578	if (source == recompileItem)
2133	2579	{
..	..	@@ -2142,7 +2588,7 @@
2142	2588	if (source == invariantsItem)
2143	2589	{
2144	2590	System.out.println("Invariants:");
2145		- Grafreed.grafreeD.universe.invariants();
	2591	+ Grafreed.grafreed.universe.invariants();
2146	2592	} else
2147	2593	if (source == memoryItem)
2148	2594	{
..	..	@@ -2173,17 +2619,40 @@
2173	2619	{
2174	2620	ToggleFullScreen();
2175	2621	} else
2176		- if (source == undoButton)
	2622	+ if (source == previousVersionButton)
2177	2623	{
2178		- Undo();
	2624	+ // Go to previous version
	2625	+ //if (!Undo())
	2626	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2627	+ PreviousVersion();
2179	2628	} else
2180		- if (source == redoButton)
	2629	+ if (source == restoreButton)
2181	2630	{
2182		- Redo();
	2631	+ // Restore current version
	2632	+ Restore();
	2633	+ //restoreButton.setEnabled(false);
2183	2634	} else
2184		- if (source == saveButton)
	2635	+ if (source == replaceButton)
2185	2636	{
2186		- Save();
	2637	+ // Overwrite current version
	2638	+ Replace();
	2639	+ //replaceButton.setEnabled(false);
	2640	+ } else
	2641	+ if (source == nextVersionButton)
	2642	+ {
	2643	+ // Go to next version
	2644	+ NextVersion();
	2645	+ } else
	2646	+ if (source == saveVersionButton)
	2647	+ {
	2648	+ // Save a new version
	2649	+ if (!Save(true))
	2650	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2651	+ } else
	2652	+ if (source == deleteVersionButton)
	2653	+ {
	2654	+ // Delete a new version
	2655	+ DeleteVersion();
2187	2656	} else
2188	2657	if (source == oneStepButton)
2189	2658	{
..	..	@@ -2192,17 +2661,14 @@
2192	2661	} else
2193	2662	if (source == screenfitButton)
2194	2663	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2664	ScreenFit();
2197	2665	} else
2198	2666	if (source == screenfitpointButton)
2199	2667	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2668	ScreenFitPoint();
2202	2669	} else
2203	2670	if (source == snapobjectButton)
2204	2671	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2672	SnapObject();
2207	2673	} else
2208	2674	// if (event.getSource() == recompileButton)
..	..	@@ -2241,11 +2707,11 @@
2241	2707	} else
2242	2708	if (source == undoItem)
2243	2709	{
2244		- Undo();
	2710	+ PreviousVersion();
2245	2711	} else
2246	2712	if (source == redoItem)
2247	2713	{
2248		- Redo();
	2714	+ NextVersion();
2249	2715	} else
2250	2716	if (source == duplicateItem)
2251	2717	{
..	..	@@ -2566,7 +3032,7 @@
2566	3032	{
2567	3033	StepAll();
2568	3034	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	3035	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	3036	{
2571	3037	//int indices[] = jList.getSelectedIndices();
2572	3038	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +3192,28 @@
2726	3192	} else
2727	3193	if (source == ungroupItem \|\| source == ungroupButton)
2728	3194	{
2729		- //ungroup();
	3195	+ boolean hasRoot = false;
	3196	+
2730	3197	for (int i=0; i<group.selection.size(); i++)
2731	3198	{
2732		- Ungroup(group.selection.get(i));
	3199	+ if (group.selection.get(i) == group)
	3200	+ {
	3201	+ hasRoot = true;
	3202	+ break;
	3203	+ }
2733	3204	}
2734	3205
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	3206	+ if (!hasRoot)
	3207	+ {
	3208	+ for (int i=0; i<group.selection.size(); i++)
	3209	+ {
	3210	+ Ungroup(group.selection.get(i));
	3211	+ }
	3212	+
	3213	+ ClearSelection(false);
	3214	+
	3215	+ refreshContents();
	3216	+ }
2738	3217	} else
2739	3218	if (source == genUVItem)
2740	3219	{
..	..	@@ -3035,7 +3514,7 @@
3035	3514	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036	3515	{
3037	3516	obj = (Object3D)e.nextElement();
3038		- obj.SetBumpTexture(null);
	3517	+ obj.ResetBumpTexture();
3039	3518	}
3040	3519
3041	3520	refreshContents();
..	..	@@ -3049,6 +3528,31 @@
3049	3528	obj.SetBumpTexture(obj.GetPigmentTexture());
3050	3529	}
3051	3530
	3531	+ refreshContents();
	3532	+ } else
	3533	+ if (source == embedTexturesItem)
	3534	+ {
	3535	+ Object3D obj;
	3536	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3537	+ {
	3538	+ obj = (Object3D)e.nextElement();
	3539	+ obj.EmbedTextures(true);
	3540	+ }
	3541	+
	3542	+ refreshContents();
	3543	+ } else
	3544	+ if (source == deEmbedTexturesItem)
	3545	+ {
	3546	+ Object3D obj;
	3547	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3548	+ {
	3549	+ obj = (Object3D)e.nextElement();
	3550	+ obj.EmbedTextures(false);
	3551	+ }
	3552	+
	3553	+ CameraPane.texturepigment.clear();
	3554	+ CameraPane.texturebump.clear();
	3555	+
3052	3556	refreshContents();
3053	3557	} else
3054	3558	if (source == flashSelectionButton)
..	..	@@ -3152,8 +3656,8 @@
3152	3656	// centralPanel.setVisible(true);
3153	3657	// XYZPanel.setVisible(true);
3154	3658	bigThree.ClearUI();
	3659	+ bigThree.add(scenePanel);
3155	3660	bigThree.add(centralPanel);
3156		- bigThree.add(XYZPanel);
3157	3661	bigThree.FlushUI();
3158	3662
3159	3663	cameraView.requestFocusInWindow();
..	..	@@ -3233,8 +3737,8 @@
3233	3737	// centralPanel.setVisible(true);
3234	3738	// XYZPanel.setVisible(false);
3235	3739	bigThree.ClearUI();
3236		- bigThree.add(scenePanel);
3237	3740	bigThree.add(centralPanel);
	3741	+ bigThree.add(scenePanel);
3238	3742	bigThree.FlushUI();
3239	3743
3240	3744	cameraView.requestFocusInWindow();
..	..	@@ -3326,6 +3830,12 @@
3326	3830	} else
3327	3831	if (source == editItem \|\| source == editButton)
3328	3832	{
	3833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3834	+ {
	3835	+ Object3D child = (Object3D)e.nextElement();
	3836	+ child.pinned = true;
	3837	+ }
	3838	+
3329	3839	EditSelection(false);
3330	3840	} else
3331	3841	if (source == uneditButton)
..	..	@@ -3334,9 +3844,10 @@
3334	3844	{
3335	3845	Object3D child = (Object3D)e.nextElement();
3336	3846	if(child.editWindow != null)
3337		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3847	+ child.pinned = false;
3338	3848	child.CloseUI();
3339	3849	listUI.remove(child);
	3850	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3340	3851
3341	3852	//child.editWindow = null; // ???????????
3342	3853	}
..	..	@@ -3351,16 +3862,18 @@
3351	3862	//copy.ClearUI();
3352	3863	for (Object3D obj : listUI)
3353	3864	{
	3865	+ obj.pinned = false;
3354	3866	obj.CloseUI();
3355	3867	}
3356	3868	listUI.clear();
	3869	+ SetPinStates(group.selection.size() > 0);
3357	3870	refreshContents(true);
3358	3871	} else
3359	3872	if (source == allParamsButton)
3360	3873	{
3361	3874	assert(copy == group);
3362	3875
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3876	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	3877
3365	3878	for (Object3D obj : listUI)
3366	3879	{
..	..	@@ -3409,6 +3922,9 @@
3409	3922	}
3410	3923
3411	3924	copy = group;
	3925	+
	3926	+ SetUndoStates();
	3927	+
3412	3928	//Globals.theRenderer.object = group;
3413	3929	if(!useclient)
3414	3930	{
..	..	@@ -3435,6 +3951,14 @@
3435	3951	currentLayout = sevenButton;
3436	3952	*/
3437	3953	radio.layout.doClick();
	3954	+
	3955	+ ClearUnpinned();
	3956	+
	3957	+ //Grafreed.Assert(group != null);
	3958	+ //Grafreed.Assert(group.selection != null);
	3959	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3960	+ if (group.selection == null \|\| group.selection.size() == 1)
	3961	+ EditSelection(false);
3438	3962	keepparent = group.parent;
3439	3963	// PARENT = NULL or not???
3440	3964	//group.parent = null; // ROOT
..	..	@@ -3446,11 +3970,13 @@
3446	3970	} else if (event.getSource() == editCameraItem)
3447	3971	{
3448	3972	cameraView.ProtectCamera();
	3973	+ cameraView.requestFocusInWindow();
3449	3974	cameraView.repaint();
3450	3975	return;
3451	3976	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3452	3977	{
3453	3978	cameraView.RevertCamera();
	3979	+ cameraView.requestFocusInWindow();
3454	3980	cameraView.repaint();
3455	3981	return;
3456	3982	// } else if (event.getSource() == textureButton)
..	..	@@ -4027,7 +4553,7 @@
4027	4553
4028	4554	try
4029	4555	{
4030		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4556	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031	4557	}
4032	4558	catch (Exception e)
4033	4559	{
..	..	@@ -4502,12 +5028,14 @@
4502	5028	// }
4503	5029	// }
4504	5030
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	5031	void EditSelection(boolean newWindow)
4510	5032	{
	5033	+ if (group.selection == null)
	5034	+ {
	5035	+ EditElement(group, newWindow); // ? new
	5036	+ return;
	5037	+ }
	5038	+
4511	5039	// aConstraints.gridy = 0;
4512	5040	for (int i=0; i<group.selection.size(); i++)
4513	5041	{
..	..	@@ -4518,12 +5046,7 @@
4518	5046	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	5047	if(elem != group \|\| !newWindow)
4520	5048	{
4521		- // if (!(elem instanceof Composite))
4522		- // newWindow = false;
4523		- listUI.add(elem);
4524		- elem.openEditWindow(this, newWindow); //, false);
4525		- System.out.println("edit : " + elem);
4526		- elem.editWindow.refreshContents(true); // ? new
	5049	+ EditElement(elem, newWindow); // ? new
4527	5050	}
4528	5051	}
4529	5052	}
..	..	@@ -4586,9 +5109,7 @@
4586	5109
4587	5110	freezemodel = false;
4588	5111	}
4589		-
4590		- boolean flashIt = true;
4591		-
	5112	+
4592	5113	public void valueChanged(TreeSelectionEvent e)
4593	5114	//public boolean handleEvent(Event event)
4594	5115	{
..	..	@@ -4598,7 +5119,8 @@
4598	5119	//new Exception().printStackTrace();
4599	5120
4600	5121	freezemodel = true;
4601		-
	5122	+ ClearUnpinned();
	5123	+
4602	5124	/**/
4603	5125	//switch (event.id)
4604	5126	{
..	..	@@ -4631,7 +5153,7 @@
4631	5153	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	5154	// a camera
4633	5155	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	5156	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	5157	{
4636	5158	CameraPane.camerachangeframe = 0; // don't refuse it
4637	5159	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +5162,13 @@
4640	5162	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	5163	}
4642	5164
	5165	+ if (tps != null && tps.length == 1)
	5166	+ {
	5167	+ EditSelection(false);
	5168	+ }
	5169	+
	5170	+ SetPinStates(tps != null && tps.length > 0);
	5171	+
4643	5172	refreshContents();
4644	5173	//return true;
4645	5174	}
..	..	@@ -4649,10 +5178,20 @@
4649	5178	freezemodel = false;
4650	5179	}
4651	5180
	5181	+ void SetPinStates(boolean enabled)
	5182	+ {
	5183	+ editButton.setEnabled(enabled);
	5184	+ uneditButton.setEnabled(enabled);
	5185	+ //unselectButton.setEnabled(enabled);
	5186	+ flashSelectionButton.setEnabled(enabled);
	5187	+
	5188	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5189	+ }
	5190	+
4652	5191	void refreshContents(boolean cp)
4653	5192	{
4654		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	5193	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5194	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	5195	{
4657	5196	objEditor.ClearInfo(); // .GetMaterial());
4658	5197
..	..	@@ -4751,8 +5290,8 @@
4751	5290
4752	5291	if (cut)
4753	5292	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	5293	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5294	+// Save();
4756	5295	//int indices[] = jList.getSelectedIndices();
4757	5296	//for (int i = indices.length - 1; i >= 0; i--)
4758	5297	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5394,10 @@
4855	5394
4856	5395	void paste(boolean expand)
4857	5396	{
	5397	+ if (Globals.REPLACEONMAKE)
	5398	+ Save();
	5399	+ boolean keep = Globals.REPLACEONMAKE;
	5400	+ Globals.REPLACEONMAKE = false;
4858	5401	// if (GrafreeD.clipboard == null)
4859	5402	// return;
4860	5403	boolean first = true;
..	..	@@ -4914,6 +5457,7 @@
4914	5457	Grafreed.clipboard.get(0).parent = keepparent;
4915	5458	}
4916	5459
	5460	+ Globals.REPLACEONMAKE = keep;
4917	5461	ResetModel();
4918	5462	refreshContents();
4919	5463	}
..	..	@@ -5049,6 +5593,10 @@
5049	5593
5050	5594	void group(Object3D csg, boolean grab)
5051	5595	{
	5596	+ if (Globals.REPLACEONMAKE)
	5597	+ Save();
	5598	+ boolean keep = Globals.REPLACEONMAKE;
	5599	+ Globals.REPLACEONMAKE = false;
5052	5600	if (//false) // why??
5053	5601	!group.selection.isEmpty())
5054	5602	{
..	..	@@ -5162,10 +5710,15 @@
5162	5710	//node.add(csg);
5163	5711	//makeSomething(node);
5164	5712	makeSomething(csg);
	5713	+ Globals.REPLACEONMAKE = keep;
5165	5714	}
5166	5715
5167	5716	void Ungroup(Object3D g)
5168	5717	{
	5718	+ if (Globals.REPLACEONMAKE)
	5719	+ Save();
	5720	+ boolean keep = Globals.REPLACEONMAKE;
	5721	+ Globals.REPLACEONMAKE = false;
5169	5722	if (g instanceof HiddenObject)
5170	5723	{
5171	5724	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5735,7 @@
5182	5735	objEditor.makeSomething(g.get(i), false);
5183	5736	}
5184	5737	}
	5738	+ Globals.REPLACEONMAKE = keep;
5185	5739	}
5186	5740
5187	5741	void ungroup()
..	..	@@ -5472,12 +6026,6 @@
5472	6026
5473	6027	cButton restoreCameraButton;
5474	6028
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480		- cButton saveButton;
5481	6029	cButton oneStepButton;
5482	6030
5483	6031	cButton groupButton;
..	..	@@ -5486,6 +6034,22 @@
5486	6034	cButton switchButton;
5487	6035	cButton loopButton;
5488	6036	cButton textureButton;
	6037	+
	6038	+ cButton skybox1Button;
	6039	+ cButton skybox2Button;
	6040	+ cButton skybox3Button;
	6041	+ cButton skybox4Button;
	6042	+ cButton skybox5Button;
	6043	+ cButton skybox6Button;
	6044	+ cButton skybox7Button;
	6045	+
	6046	+ cButton skybox11Button;
	6047	+ cButton skybox12Button;
	6048	+ cButton skybox13Button;
	6049	+ cButton skybox14Button;
	6050	+ cButton skybox15Button;
	6051	+ cButton skybox16Button;
	6052	+ cButton skybox17Button;
5489	6053
5490	6054	cButton gridButton;
5491	6055	cButton boxButton;
..	..	@@ -5550,7 +6114,7 @@
5550	6114	private MenuItem pasteLinkItem;
5551	6115	private MenuItem pasteCloneItem;
5552	6116	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	6117	+ private MenuItem deleteItem;
5554	6118	private MenuItem clearAllItem;
5555	6119	private MenuItem genUVItem;
5556	6120	private MenuItem genNormalsMESHItem;
..	..	@@ -5634,6 +6198,8 @@
5634	6198	private MenuItem attachBumpItem;
5635	6199	private MenuItem detachBumpItem;
5636	6200	private MenuItem pigmentBumpItem;
	6201	+ private MenuItem embedTexturesItem;
	6202	+ private MenuItem deEmbedTexturesItem;
5637	6203
5638	6204	private MenuItem particleItem;
5639	6205	private MenuItem ragdollItem;