~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -23,6 +23,31 @@
23	23	DragGestureListener, DragSourceListener, DropTargetListener,
24	24	ItemListener // ListSelectionListener
25	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row3)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row3.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ skyboxButton.setToolTipText(s);
	33	+ skyboxButton.addActionListener(new ActionListener()
	34	+ {
	35	+ @Override
	36	+ public void actionPerformed(ActionEvent e)
	37	+ {
	38	+ ChangeSkybox(path);
	39	+ }
	40	+ });
	41	+ }
	42	+
	43	+ public void ChangeSkybox(String name)
	44	+ {
	45	+ cameraView.envyoff = false;
	46	+ cameraView.skyboxname = name;
	47	+ cameraView.skyboxext = "jpg";
	48	+ cameraView.repaint();
	49	+ }
	50	+
26	51	//ObjEditor objEditor;
27	52	public void closeUI2()
28	53	{
..	..	@@ -60,6 +85,12 @@
60	85	this.copy = this.group = group;
61	86	//selectees = this.group.selectees;
62	87
	88	+ if (copy.versions == null)
	89	+ {
	90	+ copy.versions = new byte[100][];
	91	+ copy.versionindex = -1;
	92	+ }
	93	+
63	94	if(ui)
64	95	SetupUI(objEditor);
65	96	}
..	..	@@ -80,10 +111,22 @@
80	111	SetupViews(objEditor);
81	112
82	113	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	114	+
	115	+ if (copy.versions == null)
	116	+ {
	117	+ copy.versions = new byte[100][];
	118	+ copy.versionindex = -1;
	119	+
	120	+ Save(true);
	121	+ }
83	122	}
84	123
85	124	void CloneSelection(boolean supports)
86	125	{
	126	+ if (Globals.REPLACEONMAKE)
	127	+ Save();
	128	+ boolean keep = Globals.REPLACEONMAKE;
	129	+ Globals.REPLACEONMAKE = false;
87	130	// Object3D keep = GrafreeD.clipboard;
88	131	//Object3D obj;
89	132	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +137,7 @@
94	137
95	138	makeSomething(clone, i==group.selection.size()-1);
96	139	}
	140	+ Globals.REPLACEONMAKE = keep;
97	141	}
98	142
99	143	void CloneClipboard(boolean supports)
..	..	@@ -189,8 +233,8 @@
189	233	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190	234	// pasteExpandItem.addActionListener(this);
191	235	menu.add("-");
192		- clearItem = menu.add(new MenuItem("Clear"));
193		- clearItem.addActionListener(this);
	236	+ deleteItem = menu.add(new MenuItem("Delete"));
	237	+ deleteItem.addActionListener(this);
194	238
195	239	if (Globals.ADVANCED)
196	240	{
..	..	@@ -220,7 +264,7 @@
220	264	// toggleSwitchItem.addItemListener(this);
221	265	// toggleSwitchItem.setState(CameraPane.SWITCH);
222	266
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	267	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	268	toggleHandleItem.addItemListener(this);
225	269	toggleHandleItem.setState(CameraPane.HANDLES);
226	270
..	..	@@ -380,13 +424,14 @@
380	424	shadowYItem.addActionListener(this);
381	425	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382	426	shadowZItem.addActionListener(this);
	427	+ attributeItem = menu.add(new MenuItem("Attribute"));
	428	+ attributeItem.addActionListener(this);
	429	+
383	430	if (Globals.ADVANCED)
384	431	{
385	432	menu.add("-");
386	433	linkerItem = menu.add(new MenuItem("Linker"));
387	434	linkerItem.addActionListener(this);
388		- attributeItem = menu.add(new MenuItem("Attribute"));
389		- attributeItem.addActionListener(this);
390	435	templateItem = menu.add(new MenuItem("Template"));
391	436	templateItem.addActionListener(this);
392	437	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -415,7 +460,7 @@
415	460	genNormalsMESHItem.addActionListener(this);
416	461	if (Globals.ADVANCED)
417	462	{
418		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	463	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419	464	genNormalsMINEItem.addActionListener(this);
420	465	}
421	466	stripifyItem = menu.add(new MenuItem("Stripify"));
..	..	@@ -508,10 +553,15 @@
508	553	attachBumpItem.addActionListener(this);
509	554	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510	555	pigmentBumpItem.addActionListener(this);
	556	+ //embedTexturesItem
511	557	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512	558	detachPigmentItem.addActionListener(this);
513	559	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514	560	detachBumpItem.addActionListener(this);
	561	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	562	+ embedTexturesItem.addActionListener(this);
	563	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	564	+ deEmbedTexturesItem.addActionListener(this);
515	565	menu.add("-");
516	566	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517	567	sortbysizeItem.addActionListener(this);
..	..	@@ -538,6 +588,7 @@
538	588	buildToolsMenu(menu);
539	589	}
540	590
	591	+
541	592	void SetupUI2(ObjEditor oe)
542	593	{
543	594	// June 2019
..	..	@@ -590,48 +641,66 @@
590	641	//minButton.setToolTipText("Minimize window");
591	642	//minButton.addActionListener(this);
592	643
593		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594		- maxButton.setToolTipText("Maximize window");
595		- maxButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ maxButton.setToolTipText("Maximize window");
	648	+ maxButton.addActionListener(this);
	649	+ }
596	650
597	651	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598	652	fullButton.setToolTipText("Full-screen window");
599	653	fullButton.addActionListener(this);
600	654
	655	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ screenfitButton.setToolTipText("Screen fit");
	657	+ screenfitButton.addActionListener(this);
	658	+
601	659	oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	660	restoreCameraButton.setToolTipText("Restore viewpoint");
603	661	restoreCameraButton.addActionListener(this);
604	662
	663	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ saveButton.setToolTipText("New version");
	665	+ saveButton.addActionListener(this);
	666	+
605	667	copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606		- undoButton.setToolTipText("Undo changes");
	668	+ undoButton.setToolTipText("Previous version");
607	669	undoButton.addActionListener(this);
	670	+ undoButton.setEnabled(false);
	671	+
	672	+ cGridBag updown = new cGridBag().setVertical(true);
	673	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ restoreButton.setToolTipText("Restore current");
	675	+ restoreButton.addActionListener(this);
	676	+ restoreButton.setEnabled(false);
	677	+
	678	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ replaceButton.setToolTipText("Replace current");
	680	+ replaceButton.addActionListener(this);
	681	+ replaceButton.setEnabled(false);
	682	+
	683	+ copyOptionsPanel.add(updown);
608	684
609	685	copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610		- redoButton.setToolTipText("Redo changes");
	686	+ redoButton.setToolTipText("Next version");
611	687	redoButton.addActionListener(this);
	688	+ redoButton.setEnabled(false);
612	689
613		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614		- saveButton.setToolTipText("Save changes");
615		- saveButton.addActionListener(this);
616		-
617		- copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
618	691	liveCB.setToolTipText("Enable animation");
619	692	liveCB.addItemListener(this);
620	693
621		- copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622	695	oneStepButton.setToolTipText("Animate one step forward");
623	696	oneStepButton.addActionListener(this);
624	697
625		- copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	698	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626	699	fastCB.setToolTipText("Fast mode");
627	700	fastCB.addItemListener(this);
628	701
629	702	//oe.toolboxPanel.Return();
630	703
631		- copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632		- screenfitButton.setToolTipText("Screen fit");
633		- screenfitButton.addActionListener(this);
634		-
635	704	// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636	705	// trackCB.setToolTipText("Enable tracking");
637	706	// trackCB.addItemListener(this);
..	..	@@ -644,31 +713,32 @@
644	713	oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645	714	snapobjectButton.addActionListener(this);
646	715	snapobjectButton.setToolTipText("Snap Object");
	716	+
	717	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ fourButton.addActionListener(this);
	719	+ fourButton.setToolTipText("Show control panel only");
647	720	}
648	721
649	722	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650	723
651		- oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652		- twoButton.setToolTipText("Show center view only");
	724	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ twoButton.setToolTipText("Show 3D view only");
653	726	twoButton.addActionListener(this);
654	727	this.fullscreenLayout = twoButton;
655	728
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");
	729	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ threeButton.setToolTipText("Show controls and 3D view");
664	731	threeButton.addActionListener(this);
665		- oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666		- sevenButton.setToolTipText("3-column layout");
667		- sevenButton.addActionListener(this);
	732	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ sixButton.setToolTipText("Show 3D view and controls");
	734	+ sixButton.addActionListener(this);
	735	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+// sevenButton.setToolTipText("3-column layout");
	737	+// sevenButton.addActionListener(this);
668	738	//
669	739
670		- oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671		- rootButton.setToolTipText("Edit selection in new tab");
	740	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ rootButton.setToolTipText("Open selection in new tab");
672	742	rootButton.addActionListener(this);
673	743
674	744	oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -677,28 +747,30 @@
677	747	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678	748	//clearButton.addActionListener(this);
679	749
	750	+ cGridBag row1 = new cGridBag();
	751	+
680	752	// INSERT
681		- oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682	754	gridButton.setToolTipText("Create grid");
683	755	gridButton.addActionListener(this);
684	756
685		- oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686	758	boxButton.setToolTipText("Create box");
687	759	boxButton.addActionListener(this);
688	760
689		- oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690	762	sphereButton.setToolTipText("Create sphere");
691	763	sphereButton.addActionListener(this);
692	764
693		- oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	766	coneButton.setToolTipText("Create cone");
695	767	coneButton.addActionListener(this);
696	768
697		- oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698	770	torusButton.setToolTipText("Create torus");
699	771	torusButton.addActionListener(this);
700	772
701		- oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702	774	superButton.setToolTipText("Create superellipsoid");
703	775	superButton.addActionListener(this);
704	776
..	..	@@ -709,51 +781,157 @@
709	781	kleinButton.addActionListener(this);
710	782	}
711	783
712		- oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713	785	particlesButton.setToolTipText("Create particle system");
714	786	particlesButton.addActionListener(this);
715	787
716		- oe.toolboxPanel.Return();
	788	+ oe.toolboxPanel.add(row1);
717	789
718		- oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	790	+ cGridBag row2 = new cGridBag();
	791	+
	792	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
719	793	groupButton.setToolTipText("Create group");
720	794	groupButton.addActionListener(this);
721	795
722		- oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	796	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723	797	compositeButton.setToolTipText("Create composite");
724	798	compositeButton.addActionListener(this);
725	799
726		- oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727		- switchButton.setToolTipText("Create switch");
	800	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ switchButton.setToolTipText("Create item switcher");
728	802	switchButton.addActionListener(this);
729	803
730		- oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	804	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731	805	loopButton.setToolTipText("Create loop");
732	806	loopButton.addActionListener(this);
733	807
734		- oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	808	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735	809	textureButton.setToolTipText("Create texture");
736	810	textureButton.addActionListener(this);
737	811
738		- oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	812	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739	813	overlayButton.setToolTipText("Create overlay");
740	814	overlayButton.addActionListener(this);
741	815
742		- oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	816	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
743	817	lightButton.setToolTipText("Create light");
744	818	lightButton.addActionListener(this);
745	819
	820	+ oe.toolboxPanel.add(row2);
	821	+
	822	+ // ENVYMAPS
	823	+ cGridBag row3 = new cGridBag();
	824	+ row3.preferredHeight = 20;
	825	+
	826	+ AddSkyboxButton("default", "rgb", row3);
	827	+ AddSkyboxButton("default", "cornell", row3);
	828	+ AddSkyboxButton("default", "uffizi", row3);
	829	+ AddSkyboxButton("default", "CloudyHills", row3);
	830	+ AddSkyboxButton("default", "skycube", row3);
	831	+
	832	+ oe.toolboxPanel.add(row3);
	833	+
	834	+ cGridBag row4 = new cGridBag();
	835	+ row4.preferredHeight = 20;
	836	+
	837	+ AddSkyboxButton("bridge", "Bridge2", row4);
	838	+ AddSkyboxButton("urban", "GamlaStan2", row4);
	839	+ AddSkyboxButton("urban", "Parliament", row4);
	840	+ AddSkyboxButton("urban", "Roundabout", row4);
	841	+
	842	+ oe.toolboxPanel.add(row4);
	843	+
	844	+ cGridBag row5 = new cGridBag();
	845	+ row5.preferredHeight = 20;
	846	+
	847	+ AddSkyboxButton("urban", "SaintLazarusChurch", row5);
	848	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row5);
	849	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row5);
	850	+ AddSkyboxButton("urban", "UnionSquare", row5);
	851	+
	852	+ oe.toolboxPanel.add(row5);
	853	+
	854	+ cGridBag row6 = new cGridBag();
	855	+ row6.preferredHeight = 20;
	856	+
	857	+ AddSkyboxButton("park", "BerzeliiPark", row6);
	858	+ AddSkyboxButton("park", "Buddha", row6);
	859	+ AddSkyboxButton("park", "CNTower2", row6);
	860	+ //AddSkyboxButton("park", "Fatbursparken", row6);
	861	+ AddSkyboxButton("park", "NiagaraFalls1", row6);
	862	+
	863	+ oe.toolboxPanel.add(row6);
	864	+
	865	+ cGridBag row7 = new cGridBag();
	866	+ row7.preferredHeight = 20;
	867	+
	868	+ AddSkyboxButton("park", "NiagaraFalls3", row7);
	869	+ AddSkyboxButton("park", "Park", row7);
	870	+ //AddSkyboxButton("park", "Park2", row6);
	871	+ //AddSkyboxButton("park", "Path", row6);
	872	+ AddSkyboxButton("park", "Pond", row7);
	873	+ AddSkyboxButton("park", "Skansen", row7);
	874	+
	875	+ oe.toolboxPanel.add(row7);
	876	+
	877	+ cGridBag row8 = new cGridBag();
	878	+ row8.preferredHeight = 20;
	879	+
	880	+ AddSkyboxButton("park", "Skansen2", row8);
	881	+ AddSkyboxButton("park", "Skansen3", row8);
	882	+ AddSkyboxButton("park", "Skansen4", row8);
	883	+ AddSkyboxButton("park", "Skansen5", row8);
	884	+
	885	+ oe.toolboxPanel.add(row8);
	886	+
	887	+ cGridBag row9 = new cGridBag();
	888	+ row9.preferredHeight = 20;
	889	+
	890	+ AddSkyboxButton("park", "Stairs", row9);
	891	+ //AddSkyboxButton("park", "Tantolunden", row6);
	892	+ //AddSkyboxButton("park", "Tantolunden3", row6);
	893	+ AddSkyboxButton("park", "Tantolunden4", row9);
	894	+
	895	+ oe.toolboxPanel.add(row9);
	896	+/*
	897	+BerzeliiPark
	898	+Buddha
	899	+CNTower2
	900	+Fatbursparken
	901	+NiagaraFalls1
	902	+NiagaraFalls3
	903	+Park
	904	+Park2
	905	+Path
	906	+Pond
	907	+Skansen
	908	+Skansen2
	909	+Skansen3
	910	+Skansen4
	911	+Skansen5
	912	+Stairs
	913	+Tantolunden
	914	+Tantolunden3
	915	+Tantolunden4
	916	+ */
	917	+
	918	+ for (int i=1; --i>=0;)
	919	+ {
	920	+ //oe.toolboxPanel.Return();
	921	+ oe.toolboxPanel.add(new cGridBag());
	922	+ }
	923	+
746	924	// EDIT panel
747		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748		- editButton.setToolTipText("Edit selection");
	925	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	926	+ editButton.setToolTipText("Pin selection controls");
749	927	editButton.addActionListener(this);
750	928
751		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752		- uneditButton.setToolTipText("Unedit selection");
	929	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	930	+ uneditButton.setToolTipText("Remove selection controls");
753	931	uneditButton.addActionListener(this);
754	932
755	933	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756		- allParamsButton.setToolTipText("Edit all params");
	934	+ allParamsButton.setToolTipText("Show all controle");
757	935	allParamsButton.addActionListener(this);
758	936
759	937	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -770,6 +948,7 @@
770	948
771	949	editCommandsPanel.preferredHeight = 1;
772	950
	951	+ SetPinStates(false);
773	952	// oe.treePanel.add(commandsPanel);
774	953	// oe.treePanel.Return();
775	954
..	..	@@ -796,9 +975,12 @@
796	975
797	976	oe.treePanel.add(copyOptionsPanel);
798	977	oe.treePanel.Return();
	978	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	979	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	980	+ sliderPane.preferredHeight = 1;
799	981
800		-// mainPanel.setDividerLocation(0.5); //1.0);
801		-// mainPanel.setResizeWeight(0.5);
	982	+// mainPanel.setDividerLocation(0.1); //1.0);
	983	+ mainPanel.setResizeWeight(0.4);
802	984
803	985	//jList.addListSelectionListener(this);
804	986	oe.jTree.addTreeSelectionListener(this);
..	..	@@ -806,7 +988,7 @@
806	988	//jTree.setEditable(true);
807	989	oe.jTree.setDragEnabled(true);
808	990	//jTree.setPreferredSize(new Dimension(10,10));
809		- jSP.setPreferredSize(new Dimension(100,200));
	991	+ //jSP.setPreferredSize(new Dimension(100,200));
810	992
811	993	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812	994
..	..	@@ -818,7 +1000,7 @@
818	1000	dgr.addDragGestureListener(this);
819	1001	}catch(Exception e) {}
820	1002	*/
821		- radio.layout = sevenButton;
	1003	+ radio.layout = sixButton; // sevenButton;
822	1004	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823	1005	}
824	1006
..	..	@@ -843,14 +1025,18 @@
843	1025	boxCB.addItemListener(this);
844	1026
845	1027	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	1028	+ zoomBoxCB.setToolTipText("Display only for wheel");
847	1029	zoomBoxCB.addItemListener(this);
848	1030
849	1031	if (true) // Globals.ADVANCED)
850	1032	{
851		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852		- supportCB.setToolTipText("Enable rigging");
853		- supportCB.addItemListener(this);
	1033	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1034	+// supportCB.setToolTipText("Enable rigging");
	1035	+// supportCB.addItemListener(this);
	1036	+
	1037	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1038	+ freezeCB.setToolTipText("Fast moving camera");
	1039	+ freezeCB.addItemListener(this);
854	1040
855	1041	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856	1042	// localCB.addItemListener(this);
..	..	@@ -905,7 +1091,7 @@
905	1091	oeilCB.addItemListener(this);
906	1092
907	1093	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908		- shadowCB.setToolTipText("Compute shadows when live");
	1094	+ shadowCB.setToolTipText("When live compute shadows");
909	1095	shadowCB.addItemListener(this);
910	1096
911	1097	panel.Return();
..	..	@@ -914,12 +1100,12 @@
914	1100	toggleTextureCB.addItemListener(this);
915	1101
916	1102	panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917		- toggleSwitchCB.setToolTipText("Use switch");
	1103	+ toggleSwitchCB.setToolTipText("Choose a single item");
918	1104	toggleSwitchCB.addItemListener(this);
919	1105
920		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921		- autosaveCB.setToolTipText("Auto-save on structure change");
922		- autosaveCB.addItemListener(this);
	1106	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1107	+ autokeepCB.setToolTipText("On structure change");
	1108	+ autokeepCB.addItemListener(this);
923	1109
924	1110	panel.Return();
925	1111	if (Globals.ADVANCED)
..	..	@@ -948,7 +1134,7 @@
948	1134	{
949	1135	cRadio radioButton = new cRadio(obj.name);
950	1136
951		- // Patch to avoid bug with transparency.
	1137	+ // June 2019. Patch to avoid bug with transparency.
952	1138	radioButton.hadMaterial = obj.material != null;
953	1139	if (!radioButton.hadMaterial)
954	1140	{
..	..	@@ -956,7 +1142,7 @@
956	1142	}
957	1143
958	1144	radioButton.SetObject(obj);
959		- radioButton.layout = sevenButton;
	1145	+ radioButton.layout = sixButton; // sevenButton;
960	1146	radioButton.SetCamera(cameraView.renderCamera, false);
961	1147	radioButton.addActionListener(this);
962	1148	radioPanel.add(radioButton);
..	..	@@ -985,6 +1171,7 @@
985	1171	cCheckBox slowCB;
986	1172	cCheckBox boxCB;
987	1173	cCheckBox zoomBoxCB;
	1174	+ cCheckBox freezeCB;
988	1175	//cToggleButton trackCB;
989	1176	cCheckBox trackCB;
990	1177	cCheckBox smoothfocusCB;
..	..	@@ -995,7 +1182,7 @@
995	1182
996	1183	cCheckBox oeilCB;
997	1184	cCheckBox shadowCB;
998		- cCheckBox autosaveCB;
	1185	+ cCheckBox autokeepCB;
999	1186	cCheckBox lookAtCB;
1000	1187
1001	1188	// static int COLOR = 1;
..	..	@@ -1103,9 +1290,13 @@
1103	1290	{
1104	1291	Globals.COMPUTESHADOWWHENLIVE ^= true;
1105	1292	}
1106		- else if(e.getSource() == autosaveCB)
	1293	+ else if(e.getSource() == freezeCB)
1107	1294	{
1108		- Globals.SAVEONMAKE ^= true;
	1295	+ Globals.FREEZEONMOVE ^= true;
	1296	+ }
	1297	+ else if(e.getSource() == autokeepCB)
	1298	+ {
	1299	+ Globals.REPLACEONMAKE ^= true;
1109	1300	}
1110	1301	else if(e.getSource() == lookAtCB)
1111	1302	{
..	..	@@ -1187,8 +1378,6 @@
1187	1378	}
1188	1379	}
1189	1380
1190		- String string = (String) object;
1191		-
1192	1381	System.out.println("Transfer = " + object + "; drop : " + target);
1193	1382	// if( object instanceof java.io.File[])
1194	1383	// {
..	..	@@ -1196,6 +1385,8 @@
1196	1385	// objEditor.DropFile((java.io.File[]) object, true);
1197	1386	// return;
1198	1387	// }
	1388	+
	1389	+ String string = object.toString();
1199	1390
1200	1391	// File path for Mac and Windows
1201	1392	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1445,6 +1636,9 @@
1445	1636	animationItem.addItemListener(this);
1446	1637	animationItem.setState(Globals.ANIMATION);
1447	1638
	1639	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1640	+ archiveItem.addActionListener(this);
	1641	+
1448	1642	menu.add("-");
1449	1643	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450	1644	parseverticesItem.addActionListener(this);
..	..	@@ -1457,6 +1651,8 @@
1457	1651	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458	1652	reduce34MorphItem.addActionListener(this);
1459	1653	menu.add("-");
	1654	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1655	+ memoryItem.addActionListener(this);
1460	1656	menu.add(computeAOItem = new MenuItem("Compute AO"));
1461	1657	computeAOItem.addActionListener(this);
1462	1658
..	..	@@ -1465,8 +1661,6 @@
1465	1661	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466	1662	mirrorItem.addActionListener(this);
1467	1663	menu.add("-");
1468		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1469		- memoryItem.addActionListener(this);
1470	1664	menu.add(analyzeItem = new MenuItem("Analyze"));
1471	1665	analyzeItem.addActionListener(this);
1472	1666	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1614,6 +1808,30 @@
1614	1808
1615	1809	makeSomething(shadow);
1616	1810	}
	1811	+
	1812	+ private void ClearUnpinned()
	1813	+ {
	1814	+ //for (Object3D obj : listUI)
	1815	+ for (int i=listUI.size(); --i>=0;)
	1816	+ {
	1817	+ Object3D obj = listUI.elementAt(i);
	1818	+ if (!obj.pinned)
	1819	+ {
	1820	+ obj.CloseUI();
	1821	+ listUI.remove(i);
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+
	1826	+ private void EditElement(Object3D elem, boolean newWindow)
	1827	+ {
	1828	+ // if (!(elem instanceof Composite))
	1829	+ // newWindow = false;
	1830	+ listUI.add(elem);
	1831	+ elem.openEditWindow(this, newWindow); //, false);
	1832	+ System.out.println("edit : " + elem);
	1833	+ elem.editWindow.refreshContents(true); // ? new
	1834	+ }
1617	1835
1618	1836	/**
1619	1837	* applyExample
..	..	@@ -2042,6 +2260,23 @@
2042	2260	{
2043	2261	makeSomething(new Light());
2044	2262	} else
	2263	+// if (source == skybox1Button \|\|
	2264	+// source == skybox2Button \|\|
	2265	+// source == skybox3Button \|\|
	2266	+// source == skybox4Button \|\|
	2267	+// source == skybox5Button \|\|
	2268	+// source == skybox6Button \|\|
	2269	+// source == skybox7Button \|\|
	2270	+// source == skybox11Button \|\|
	2271	+// source == skybox12Button \|\|
	2272	+// source == skybox13Button \|\|
	2273	+// source == skybox14Button \|\|
	2274	+// source == skybox15Button \|\|
	2275	+// source == skybox16Button \|\|
	2276	+// source == skybox17Button)
	2277	+// {
	2278	+// ChangeSkybox(source);
	2279	+// } else
2045	2280	if (source == csgItem)
2046	2281	{
2047	2282	group(new CSG());
..	..	@@ -2093,25 +2328,25 @@
2093	2328	Composite csg = new GroupLeaf();
2094	2329	csg.count = 5;
2095	2330	group(csg);
2096		- Composite child = new cGroup();
	2331	+ Composite child = new cGroup("Branch");
2097	2332	csg.addChild(child);
2098	2333	child.addChild(csg);
2099	2334	} else
2100	2335	if (source == doubleItem)
2101	2336	{
2102		- Composite csg = new GroupLeaf();
	2337	+ Composite csg = new GroupLeaf("Fork");
2103	2338	csg.count = 5;
2104	2339	group(csg);
2105		- Composite child = new cGroup();
	2340	+ Composite child = new cGroup("Branch A");
2106	2341	csg.addChild(child);
2107	2342	child.addChild(csg);
2108		- child = new cGroup();
	2343	+ child = new cGroup("Branch B");
2109	2344	csg.addChild(child);
2110	2345	child.addChild(csg);
2111	2346	} else
2112	2347	if (source == tripleItem)
2113	2348	{
2114		- Composite csg = new GroupLeaf();
	2349	+ Composite csg = new GroupLeaf("Trident");
2115	2350	csg.count = 4;
2116	2351	group(csg);
2117	2352	Composite child = new cGroup();
..	..	@@ -2127,7 +2362,7 @@
2127	2362	if (source == computeAOItem)
2128	2363	{
2129	2364	Globals.drawMode = CameraPane.OCCLUSION;
2130		- Globals.theRenderer.repaint();
	2365	+ cameraView.repaint();
2131	2366	} else
2132	2367	if (source == recompileItem)
2133	2368	{
..	..	@@ -2175,15 +2410,31 @@
2175	2410	} else
2176	2411	if (source == undoButton)
2177	2412	{
	2413	+ // Go to previous version
	2414	+ //if (!Undo())
	2415	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2178	2416	Undo();
	2417	+ } else
	2418	+ if (source == restoreButton)
	2419	+ {
	2420	+ // Restore current version
	2421	+ Restore();
	2422	+ } else
	2423	+ if (source == replaceButton)
	2424	+ {
	2425	+ // Overwrite current version
	2426	+ Replace();
2179	2427	} else
2180	2428	if (source == redoButton)
2181	2429	{
	2430	+ // Go to next version
2182	2431	Redo();
2183	2432	} else
2184	2433	if (source == saveButton)
2185	2434	{
2186		- Save();
	2435	+ // Save a new version
	2436	+ if (!Save(true))
	2437	+ java.awt.Toolkit.getDefaultToolkit().beep();
2187	2438	} else
2188	2439	if (source == oneStepButton)
2189	2440	{
..	..	@@ -2192,17 +2443,14 @@
2192	2443	} else
2193	2444	if (source == screenfitButton)
2194	2445	{
2195		- //Reload(lastConverter, lastFilename, true);
2196	2446	ScreenFit();
2197	2447	} else
2198	2448	if (source == screenfitpointButton)
2199	2449	{
2200		- //Reload(lastConverter, lastFilename, true);
2201	2450	ScreenFitPoint();
2202	2451	} else
2203	2452	if (source == snapobjectButton)
2204	2453	{
2205		- //Reload(lastConverter, lastFilename, true);
2206	2454	SnapObject();
2207	2455	} else
2208	2456	// if (event.getSource() == recompileButton)
..	..	@@ -2566,7 +2814,7 @@
2566	2814	{
2567	2815	StepAll();
2568	2816	} else
2569		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2817	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2570	2818	{
2571	2819	//int indices[] = jList.getSelectedIndices();
2572	2820	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2726,15 +2974,28 @@
2726	2974	} else
2727	2975	if (source == ungroupItem \|\| source == ungroupButton)
2728	2976	{
2729		- //ungroup();
	2977	+ boolean hasRoot = false;
	2978	+
2730	2979	for (int i=0; i<group.selection.size(); i++)
2731	2980	{
2732		- Ungroup(group.selection.get(i));
	2981	+ if (group.selection.get(i) == group)
	2982	+ {
	2983	+ hasRoot = true;
	2984	+ break;
	2985	+ }
2733	2986	}
2734	2987
2735		- ClearSelection(false);
2736		-
2737		- refreshContents();
	2988	+ if (!hasRoot)
	2989	+ {
	2990	+ for (int i=0; i<group.selection.size(); i++)
	2991	+ {
	2992	+ Ungroup(group.selection.get(i));
	2993	+ }
	2994	+
	2995	+ ClearSelection(false);
	2996	+
	2997	+ refreshContents();
	2998	+ }
2738	2999	} else
2739	3000	if (source == genUVItem)
2740	3001	{
..	..	@@ -3035,7 +3296,7 @@
3035	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036	3297	{
3037	3298	obj = (Object3D)e.nextElement();
3038		- obj.SetBumpTexture(null);
	3299	+ obj.ResetBumpTexture();
3039	3300	}
3040	3301
3041	3302	refreshContents();
..	..	@@ -3049,6 +3310,31 @@
3049	3310	obj.SetBumpTexture(obj.GetPigmentTexture());
3050	3311	}
3051	3312
	3313	+ refreshContents();
	3314	+ } else
	3315	+ if (source == embedTexturesItem)
	3316	+ {
	3317	+ Object3D obj;
	3318	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3319	+ {
	3320	+ obj = (Object3D)e.nextElement();
	3321	+ obj.EmbedTextures(true);
	3322	+ }
	3323	+
	3324	+ refreshContents();
	3325	+ } else
	3326	+ if (source == deEmbedTexturesItem)
	3327	+ {
	3328	+ Object3D obj;
	3329	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3330	+ {
	3331	+ obj = (Object3D)e.nextElement();
	3332	+ obj.EmbedTextures(false);
	3333	+ }
	3334	+
	3335	+ CameraPane.texturepigment.clear();
	3336	+ CameraPane.texturebump.clear();
	3337	+
3052	3338	refreshContents();
3053	3339	} else
3054	3340	if (source == flashSelectionButton)
..	..	@@ -3152,8 +3438,8 @@
3152	3438	// centralPanel.setVisible(true);
3153	3439	// XYZPanel.setVisible(true);
3154	3440	bigThree.ClearUI();
	3441	+ bigThree.add(scenePanel);
3155	3442	bigThree.add(centralPanel);
3156		- bigThree.add(XYZPanel);
3157	3443	bigThree.FlushUI();
3158	3444
3159	3445	cameraView.requestFocusInWindow();
..	..	@@ -3233,8 +3519,8 @@
3233	3519	// centralPanel.setVisible(true);
3234	3520	// XYZPanel.setVisible(false);
3235	3521	bigThree.ClearUI();
3236		- bigThree.add(scenePanel);
3237	3522	bigThree.add(centralPanel);
	3523	+ bigThree.add(scenePanel);
3238	3524	bigThree.FlushUI();
3239	3525
3240	3526	cameraView.requestFocusInWindow();
..	..	@@ -3326,6 +3612,12 @@
3326	3612	} else
3327	3613	if (source == editItem \|\| source == editButton)
3328	3614	{
	3615	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3616	+ {
	3617	+ Object3D child = (Object3D)e.nextElement();
	3618	+ child.pinned = true;
	3619	+ }
	3620	+
3329	3621	EditSelection(false);
3330	3622	} else
3331	3623	if (source == uneditButton)
..	..	@@ -3335,6 +3627,7 @@
3335	3627	Object3D child = (Object3D)e.nextElement();
3336	3628	if(child.editWindow != null)
3337	3629	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3630	+ child.pinned = false;
3338	3631	child.CloseUI();
3339	3632	listUI.remove(child);
3340	3633
..	..	@@ -3351,6 +3644,7 @@
3351	3644	//copy.ClearUI();
3352	3645	for (Object3D obj : listUI)
3353	3646	{
	3647	+ obj.pinned = false;
3354	3648	obj.CloseUI();
3355	3649	}
3356	3650	listUI.clear();
..	..	@@ -3360,7 +3654,7 @@
3360	3654	{
3361	3655	assert(copy == group);
3362	3656
3363		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3657	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364	3658
3365	3659	for (Object3D obj : listUI)
3366	3660	{
..	..	@@ -3409,6 +3703,9 @@
3409	3703	}
3410	3704
3411	3705	copy = group;
	3706	+
	3707	+ SetUndoStates();
	3708	+
3412	3709	//Globals.theRenderer.object = group;
3413	3710	if(!useclient)
3414	3711	{
..	..	@@ -3435,6 +3732,13 @@
3435	3732	currentLayout = sevenButton;
3436	3733	*/
3437	3734	radio.layout.doClick();
	3735	+
	3736	+ ClearUnpinned();
	3737	+ //Grafreed.Assert(group != null);
	3738	+ //Grafreed.Assert(group.selection != null);
	3739	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3740	+ if (group.selection == null \|\| group.selection.size() == 1)
	3741	+ EditSelection(false);
3438	3742	keepparent = group.parent;
3439	3743	// PARENT = NULL or not???
3440	3744	//group.parent = null; // ROOT
..	..	@@ -4027,7 +4331,7 @@
4027	4331
4028	4332	try
4029	4333	{
4030		- texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4334	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031	4335	}
4032	4336	catch (Exception e)
4033	4337	{
..	..	@@ -4502,12 +4806,14 @@
4502	4806	// }
4503	4807	// }
4504	4808
4505		- static boolean allparams = true;
4506		-
4507		- static Vector<Object3D> listUI = new Vector<Object3D>();
4508		-
4509	4809	void EditSelection(boolean newWindow)
4510	4810	{
	4811	+ if (group.selection == null)
	4812	+ {
	4813	+ EditElement(group, newWindow); // ? new
	4814	+ return;
	4815	+ }
	4816	+
4511	4817	// aConstraints.gridy = 0;
4512	4818	for (int i=0; i<group.selection.size(); i++)
4513	4819	{
..	..	@@ -4518,12 +4824,7 @@
4518	4824	Object3D elem = (Object3D)group.selection.elementAt(i);
4519	4825	if(elem != group \|\| !newWindow)
4520	4826	{
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
	4827	+ EditElement(elem, newWindow); // ? new
4527	4828	}
4528	4829	}
4529	4830	}
..	..	@@ -4598,7 +4899,8 @@
4598	4899	//new Exception().printStackTrace();
4599	4900
4600	4901	freezemodel = true;
4601		-
	4902	+ ClearUnpinned();
	4903	+
4602	4904	/**/
4603	4905	//switch (event.id)
4604	4906	{
..	..	@@ -4631,7 +4933,7 @@
4631	4933	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632	4934	// a camera
4633	4935	{
4634		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4936	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635	4937	{
4636	4938	CameraPane.camerachangeframe = 0; // don't refuse it
4637	4939	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4640,6 +4942,13 @@
4640	4942	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641	4943	}
4642	4944
	4945	+ if (tps != null && tps.length == 1)
	4946	+ {
	4947	+ EditSelection(false);
	4948	+ }
	4949	+
	4950	+ SetPinStates(tps != null && tps.length > 0);
	4951	+
4643	4952	refreshContents();
4644	4953	//return true;
4645	4954	}
..	..	@@ -4649,10 +4958,18 @@
4649	4958	freezemodel = false;
4650	4959	}
4651	4960
	4961	+ void SetPinStates(boolean enabled)
	4962	+ {
	4963	+ editButton.setEnabled(enabled);
	4964	+ uneditButton.setEnabled(enabled);
	4965	+ unselectButton.setEnabled(enabled);
	4966	+ flashSelectionButton.setEnabled(enabled);
	4967	+ }
	4968	+
4652	4969	void refreshContents(boolean cp)
4653	4970	{
4654		- if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655		- if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4971	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4972	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656	4973	{
4657	4974	objEditor.ClearInfo(); // .GetMaterial());
4658	4975
..	..	@@ -4751,8 +5068,8 @@
4751	5068
4752	5069	if (cut)
4753	5070	{
4754		- if (Globals.SAVEONMAKE)
4755		- Save();
	5071	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5072	+// Save();
4756	5073	//int indices[] = jList.getSelectedIndices();
4757	5074	//for (int i = indices.length - 1; i >= 0; i--)
4758	5075	//jList.remove(indices[i]);
..	..	@@ -4855,6 +5172,10 @@
4855	5172
4856	5173	void paste(boolean expand)
4857	5174	{
	5175	+ if (Globals.REPLACEONMAKE)
	5176	+ Save();
	5177	+ boolean keep = Globals.REPLACEONMAKE;
	5178	+ Globals.REPLACEONMAKE = false;
4858	5179	// if (GrafreeD.clipboard == null)
4859	5180	// return;
4860	5181	boolean first = true;
..	..	@@ -4914,6 +5235,7 @@
4914	5235	Grafreed.clipboard.get(0).parent = keepparent;
4915	5236	}
4916	5237
	5238	+ Globals.REPLACEONMAKE = keep;
4917	5239	ResetModel();
4918	5240	refreshContents();
4919	5241	}
..	..	@@ -5049,6 +5371,10 @@
5049	5371
5050	5372	void group(Object3D csg, boolean grab)
5051	5373	{
	5374	+ if (Globals.REPLACEONMAKE)
	5375	+ Save();
	5376	+ boolean keep = Globals.REPLACEONMAKE;
	5377	+ Globals.REPLACEONMAKE = false;
5052	5378	if (//false) // why??
5053	5379	!group.selection.isEmpty())
5054	5380	{
..	..	@@ -5162,10 +5488,15 @@
5162	5488	//node.add(csg);
5163	5489	//makeSomething(node);
5164	5490	makeSomething(csg);
	5491	+ Globals.REPLACEONMAKE = keep;
5165	5492	}
5166	5493
5167	5494	void Ungroup(Object3D g)
5168	5495	{
	5496	+ if (Globals.REPLACEONMAKE)
	5497	+ Save();
	5498	+ boolean keep = Globals.REPLACEONMAKE;
	5499	+ Globals.REPLACEONMAKE = false;
5169	5500	if (g instanceof HiddenObject)
5170	5501	{
5171	5502	HiddenObject h = (HiddenObject) g;
..	..	@@ -5182,6 +5513,7 @@
5182	5513	objEditor.makeSomething(g.get(i), false);
5183	5514	}
5184	5515	}
	5516	+ Globals.REPLACEONMAKE = keep;
5185	5517	}
5186	5518
5187	5519	void ungroup()
..	..	@@ -5472,11 +5804,6 @@
5472	5804
5473	5805	cButton restoreCameraButton;
5474	5806
5475		- cButton minButton;
5476		- cButton maxButton;
5477		- cButton fullButton;
5478		- cButton undoButton;
5479		- cButton redoButton;
5480	5807	cButton saveButton;
5481	5808	cButton oneStepButton;
5482	5809
..	..	@@ -5486,6 +5813,22 @@
5486	5813	cButton switchButton;
5487	5814	cButton loopButton;
5488	5815	cButton textureButton;
	5816	+
	5817	+ cButton skybox1Button;
	5818	+ cButton skybox2Button;
	5819	+ cButton skybox3Button;
	5820	+ cButton skybox4Button;
	5821	+ cButton skybox5Button;
	5822	+ cButton skybox6Button;
	5823	+ cButton skybox7Button;
	5824	+
	5825	+ cButton skybox11Button;
	5826	+ cButton skybox12Button;
	5827	+ cButton skybox13Button;
	5828	+ cButton skybox14Button;
	5829	+ cButton skybox15Button;
	5830	+ cButton skybox16Button;
	5831	+ cButton skybox17Button;
5489	5832
5490	5833	cButton gridButton;
5491	5834	cButton boxButton;
..	..	@@ -5550,7 +5893,7 @@
5550	5893	private MenuItem pasteLinkItem;
5551	5894	private MenuItem pasteCloneItem;
5552	5895	private MenuItem pasteExpandItem;
5553		- private MenuItem clearItem;
	5896	+ private MenuItem deleteItem;
5554	5897	private MenuItem clearAllItem;
5555	5898	private MenuItem genUVItem;
5556	5899	private MenuItem genNormalsMESHItem;
..	..	@@ -5634,6 +5977,8 @@
5634	5977	private MenuItem attachBumpItem;
5635	5978	private MenuItem detachBumpItem;
5636	5979	private MenuItem pigmentBumpItem;
	5980	+ private MenuItem embedTexturesItem;
	5981	+ private MenuItem deEmbedTexturesItem;
5637	5982
5638	5983	private MenuItem particleItem;
5639	5984	private MenuItem ragdollItem;