~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,6 +98,7 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
..	..	@@ -204,23 +209,23 @@
204	209	//zBufferItem.addActionListener(this);
205	210	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
206	211	//normalLensItem.addActionListener(this);
207		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
208		- revertCameraItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
209	214
210		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
211		- toggleFullScreenItem.addItemListener(this);
212		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
213		- cameraMenu.add("-");
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
214	227
215		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
216		- toggleTextureItem.addItemListener(this);
217		- toggleTextureItem.setState(CameraPane.textureon);
218		-
219		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
220		- toggleSwitchItem.addItemListener(this);
221		- toggleSwitchItem.setState(CameraPane.SWITCH);
222		-
223		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224	229	toggleHandleItem.addItemListener(this);
225	230	toggleHandleItem.setState(CameraPane.HANDLES);
226	231
..	..	@@ -275,7 +280,7 @@
275	280	{
276	281	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
277	282	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
278		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
279	284	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
280	285	oe.cameraMenu.add("-");
281	286	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -283,7 +288,7 @@
283	288	editLeafItem.addActionListener(this);
284	289	lookAtItem.addActionListener(this);
285	290	//lookFromItem.addActinoListener(this);
286		- //switchItem.addActionListener(this);
	291	+ //switchViewItem.addActionListener(this);
287	292	}
288	293
289	294	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -328,14 +333,14 @@
328	333	}
329	334
330	335	oe.menuBar.add(menu = new Menu("Group"));
331		- grabItem = menu.add(new MenuItem("Grab"));
332		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
333	338	backItem = menu.add(new MenuItem("Back"));
334	339	backItem.addActionListener(this);
335	340	frontItem = menu.add(new MenuItem("Front"));
336	341	frontItem.addActionListener(this);
337		- compositeItem = menu.add(new MenuItem("Composite"));
338		- compositeItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
339	344
340	345	if (Globals.ADVANCED)
341	346	{
..	..	@@ -345,10 +350,10 @@
345	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
346	351	ungroupItem.addActionListener(this);
347	352
348		- menu.add("-");
349		-
350		- randomItem = menu.add(new MenuItem("Switch node"));
351		- randomItem.addActionListener(this);
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
352	357	if (Globals.ADVANCED)
353	358	{
354	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
..	..	@@ -365,13 +370,11 @@
365	370	frameselectorItem.addActionListener(this);
366	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
367	372	scriptNodeItem.addActionListener(this);
368		- cameraItem = menu.add(new MenuItem("Camera"));
369		- cameraItem.addActionListener(this);
370	373	}
371	374
372	375	oe.menuBar.add(menu = new Menu("Object"));
373		- textureItem = menu.add(new MenuItem("Texture"));
374		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
375	378	billboardItem = menu.add(new MenuItem("Billboard"));
376	379	billboardItem.addActionListener(this);
377	380	csgItem = menu.add(new MenuItem("CSG"));
..	..	@@ -382,13 +385,14 @@
382	385	shadowYItem.addActionListener(this);
383	386	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
384	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
385	391	if (Globals.ADVANCED)
386	392	{
387	393	menu.add("-");
388	394	linkerItem = menu.add(new MenuItem("Linker"));
389	395	linkerItem.addActionListener(this);
390		- attributeItem = menu.add(new MenuItem("Attribute"));
391		- attributeItem.addActionListener(this);
392	396	templateItem = menu.add(new MenuItem("Template"));
393	397	templateItem.addActionListener(this);
394	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
..	..	@@ -582,53 +586,66 @@
582	586	oe.radioPanel.add(dummyButton);
583	587	oe.buttonGroup.add(dummyButton);
584	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
585	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	594
587	595	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	596	//minButton.setToolTipText("Minimize window");
589	597	//minButton.addActionListener(this);
590	598
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
594	605
595	606	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	607	fullButton.setToolTipText("Full-screen window");
597	608	fullButton.addActionListener(this);
598	609
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	619	undoButton.setToolTipText("Undo changes");
601	620	undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
602	622
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604	624	redoButton.setToolTipText("Redo changes");
605	625	redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
606	627
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	629	saveButton.setToolTipText("Save changes");
609	630	saveButton.addActionListener(this);
610	631
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	633	liveCB.setToolTipText("Enable animation");
613	634	liveCB.addItemListener(this);
614	635
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	637	oneStepButton.setToolTipText("Animate one step forward");
617	638	oneStepButton.addActionListener(this);
618	639
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	641	fastCB.setToolTipText("Fast mode");
621	642	fastCB.addItemListener(this);
622	643
623		- oe.toolboxPanel.Return();
	644	+ //oe.toolboxPanel.Return();
624	645
625		- oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
626		- trackCB.setToolTipText("Enable tracking");
627		- trackCB.addItemListener(this);
628		-
629		- oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630		- screenfitButton.setToolTipText("Screen fit");
631		- screenfitButton.addActionListener(this);
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
632	649
633	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	651	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,10 +657,6 @@
640	657	snapobjectButton.setToolTipText("Snap Object");
641	658	}
642	659
643		- oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
644		- flashSelectionButton.setToolTipText("Highlight selection");
645		- flashSelectionButton.addActionListener(this);
646		-
647	660	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	661
649	662	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +701,6 @@
688	701	sphereButton.setToolTipText("Create sphere");
689	702	sphereButton.addActionListener(this);
690	703
691		- oe.toolboxPanel.Return();
692		-
693	704	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	705	coneButton.setToolTipText("Create cone");
695	706	coneButton.addActionListener(this);
..	..	@@ -713,6 +724,28 @@
713	724	particlesButton.setToolTipText("Create particle system");
714	725	particlesButton.addActionListener(this);
715	726
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
716	749	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	750	overlayButton.setToolTipText("Create overlay");
718	751	overlayButton.addActionListener(this);
..	..	@@ -721,17 +754,29 @@
721	754	lightButton.setToolTipText("Create light");
722	755	lightButton.addActionListener(this);
723	756
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
724	769	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
727	772	editButton.addActionListener(this);
728	773
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
731	776	uneditButton.addActionListener(this);
732	777
733	778	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	779	+ allParamsButton.setToolTipText("Show all controle");
735	780	allParamsButton.addActionListener(this);
736	781
737	782	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +787,13 @@
742	787	unselectButton.setToolTipText("Unselect");
743	788	unselectButton.addActionListener(this);
744	789
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
	793	+
745	794	editCommandsPanel.preferredHeight = 1;
746	795
	796	+ SetPinStates(false);
747	797	// oe.treePanel.add(commandsPanel);
748	798	// oe.treePanel.Return();
749	799
..	..	@@ -768,21 +818,6 @@
768	818	oe.treePanel.add(jSPPanel);
769	819	oe.treePanel.Return();
770	820
771		- cGridBag copyOptionsPanel = new cGridBag();
772		-
773		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
774		- colorCB.setToolTipText("Copy color when dropped");
775		- colorCB.addItemListener(this);
776		-
777		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
778		- materialCB.setToolTipText("Copy material when dropped");
779		- materialCB.addItemListener(this);
780		-
781		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
782		- textureCB.setToolTipText("Copy texture when dropped");
783		- textureCB.addItemListener(this);
784		-
785		- copyOptionsPanel.preferredHeight = 1;
786	821	oe.treePanel.add(copyOptionsPanel);
787	822	oe.treePanel.Return();
788	823
..	..	@@ -813,23 +848,43 @@
813	848
814	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	850	{
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
816	865	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	866	boxCB.setToolTipText("Display bounding boxes");
818	867	boxCB.addItemListener(this);
819	868
820	869	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	871	zoomBoxCB.addItemListener(this);
823	872
824	873	if (true) // Globals.ADVANCED)
825	874	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
829	882
830	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	884	// localCB.addItemListener(this);
832	885
	886	+ panel.Return();
	887	+
833	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	889	crowdCB.setToolTipText("Used for crowds");
835	890	crowdCB.addItemListener(this);
..	..	@@ -846,6 +901,8 @@
846	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	902	// speakerMocapCB.addItemListener(this);
848	903
	904	+ panel.Return();
	905	+
849	906	if (false)
850	907	{
851	908	// handled in scripts
..	..	@@ -860,24 +917,39 @@
860	917	//constraints.gridy += 1;
861	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
863	921	}
864	922
865	923	//constraints.gridx += 1;
866	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	925	// debugCB.addItemListener(this);
868	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
869	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	932	+ oeilCB.setToolTipText("Move camera when tracking");
871	933	oeilCB.addItemListener(this);
872	934
873	935	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	936	+ shadowCB.setToolTipText("When live compute shadows");
875	937	shadowCB.addItemListener(this);
876	938
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
877	948	panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
	949	+ autosaveCB.setToolTipText("On structure change");
879	950	autosaveCB.addItemListener(this);
880	951
	952	+ panel.Return();
881	953	if (Globals.ADVANCED)
882	954	{
883	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +960,15 @@
888	960	}
889	961
890	962	cGridBag fill = new cGridBag();
891		-
892	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
893	968
894	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
895	972
896	973	}
897	974
..	..	@@ -899,7 +976,7 @@
899	976	{
900	977	cRadio radioButton = new cRadio(obj.name);
901	978
902		- // Patch to avoid bug with transparency.
	979	+ // June 2019. Patch to avoid bug with transparency.
903	980	radioButton.hadMaterial = obj.material != null;
904	981	if (!radioButton.hadMaterial)
905	982	{
..	..	@@ -936,7 +1013,9 @@
936	1013	cCheckBox slowCB;
937	1014	cCheckBox boxCB;
938	1015	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
940	1019	cCheckBox smoothfocusCB;
941	1020	// JCheckBox speakerMocapCB;
942	1021	cCheckBox speakerCameraCB;
..	..	@@ -1053,6 +1132,10 @@
1053	1132	{
1054	1133	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1134	}
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
1056	1139	else if(e.getSource() == autosaveCB)
1057	1140	{
1058	1141	Globals.SAVEONMAKE ^= true;
..	..	@@ -1137,8 +1220,6 @@
1137	1220	}
1138	1221	}
1139	1222
1140		- String string = (String) object;
1141		-
1142	1223	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1224	// if( object instanceof java.io.File[])
1144	1225	// {
..	..	@@ -1146,6 +1227,8 @@
1146	1227	// objEditor.DropFile((java.io.File[]) object, true);
1147	1228	// return;
1148	1229	// }
	1230	+
	1231	+ String string = object.toString();
1149	1232
1150	1233	// File path for Mac and Windows
1151	1234	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1274,23 @@
1191	1274
1192	1275	assert target == objEditor.jTree;
1193	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
1194	1278	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1280	} catch (Exception e) {
1197	1281	System.out.println("destinationPath : " + destinationPath);
1198	1282	return;
1199	1283	}
1200	1284
	1285	+ for (int i=group.selection.size(); --i>=0;)
	1286	+ {
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
1201	1294	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1295	// {
1203	1296	loadClipboard(true);
..	..	@@ -1312,22 +1405,30 @@
1312	1405	{
1313	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1407	//heightFieldItem.addActionListener(this);
1315		- gridItem = menu.add(new MenuItem("Grid"));
1316		- gridItem.addActionListener(this);
1317		- rectoidItem = menu.add(new MenuItem("Box"));
1318		- rectoidItem.addActionListener(this);
1319		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1320		- ellipsoidItem.addActionListener(this);
1321		- coneItem = menu.add(new MenuItem("Cone"));
1322		- coneItem.addActionListener(this);
1323		- torusItem = menu.add(new MenuItem("Torus"));
1324		- torusItem.addActionListener(this);
1325		- superItem = menu.add(new MenuItem("Superellipsoid"));
1326		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1327	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1427	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
1331	1432	if (Globals.ADVANCED)
1332	1433	{
1333	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1454,15 @@
1353	1454	}
1354	1455	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1456	bezierItem.addActionListener(this);
1356		- overlayItem = menu.add(new MenuItem("Overlay"));
1357		- overlayItem.addActionListener(this);
1358		- lightItem = menu.add(new MenuItem("Light"));
1359		- lightItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1360	1461	menu.add("-");
1361	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1463	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1365	1466	doubleItem = menu.add(new MenuItem("Fork"));
1366	1467	doubleItem.addActionListener(this);
1367	1468	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1478,9 @@
1377	1478	animationItem.addItemListener(this);
1378	1479	animationItem.setState(Globals.ANIMATION);
1379	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1380	1484	menu.add("-");
1381	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1486	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1493,8 @@
1389	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1494	reduce34MorphItem.addActionListener(this);
1391	1495	menu.add("-");
	1496	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1497	+ memoryItem.addActionListener(this);
1392	1498	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1499	computeAOItem.addActionListener(this);
1394	1500
..	..	@@ -1397,8 +1503,6 @@
1397	1503	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1504	mirrorItem.addActionListener(this);
1399	1505	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1507	analyzeItem.addActionListener(this);
1404	1508	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1650,20 @@
1546	1650
1547	1651	makeSomething(shadow);
1548	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1549	1667
1550	1668	/**
1551	1669	* applyExample
..	..	@@ -1790,7 +1908,7 @@
1790	1908	{
1791	1909	ScreenFit();
1792	1910	} else
1793		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1794	1912	{
1795	1913	cVector v1 = new cVector();
1796	1914	cVector v2 = new cVector();
..	..	@@ -2020,30 +2138,30 @@
2020	2138
2021	2139	group(g);
2022	2140	} else
2023		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
2024	2142	{
2025	2143	Composite csg = new GroupLeaf();
2026	2144	csg.count = 5;
2027	2145	group(csg);
2028		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
2029	2147	csg.addChild(child);
2030	2148	child.addChild(csg);
2031	2149	} else
2032	2150	if (source == doubleItem)
2033	2151	{
2034		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
2035	2153	csg.count = 5;
2036	2154	group(csg);
2037		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
2038	2156	csg.addChild(child);
2039	2157	child.addChild(csg);
2040		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
2041	2159	csg.addChild(child);
2042	2160	child.addChild(csg);
2043	2161	} else
2044	2162	if (source == tripleItem)
2045	2163	{
2046		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
2047	2165	csg.count = 4;
2048	2166	group(csg);
2049	2167	Composite child = new cGroup();
..	..	@@ -2107,7 +2225,8 @@
2107	2225	} else
2108	2226	if (source == undoButton)
2109	2227	{
2110		- Undo();
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
2111	2230	} else
2112	2231	if (source == redoButton)
2113	2232	{
..	..	@@ -2115,7 +2234,8 @@
2115	2234	} else
2116	2235	if (source == saveButton)
2117	2236	{
2118		- Save();
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2239	} else
2120	2240	if (source == oneStepButton)
2121	2241	{
..	..	@@ -2124,17 +2244,14 @@
2124	2244	} else
2125	2245	if (source == screenfitButton)
2126	2246	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2247	ScreenFit();
2129	2248	} else
2130	2249	if (source == screenfitpointButton)
2131	2250	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2251	ScreenFitPoint();
2134	2252	} else
2135	2253	if (source == snapobjectButton)
2136	2254	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2255	SnapObject();
2139	2256	} else
2140	2257	// if (event.getSource() == recompileButton)
..	..	@@ -2510,9 +2627,9 @@
2510	2627	{
2511	2628	ClearSelection(true);
2512	2629	} else
2513		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2514	2631	{
2515		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2516	2633	} else
2517	2634	if (source == hideItem)
2518	2635	{
..	..	@@ -2530,11 +2647,11 @@
2530	2647	{
2531	2648	makeSomething(new Camera());
2532	2649	} else
2533		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2534	2651	{
2535	2652	group(new Composite());
2536	2653	} else
2537		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2538	2655	{
2539	2656	RandomNode random = new RandomNode();
2540	2657	group(random);
..	..	@@ -2636,7 +2753,7 @@
2636	2753	{
2637	2754	group(new cLinker());
2638	2755	} else
2639		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2640	2757	{
2641	2758	group(new TextureNode());
2642	2759	} else
..	..	@@ -2658,15 +2775,28 @@
2658	2775	} else
2659	2776	if (source == ungroupItem \|\| source == ungroupButton)
2660	2777	{
2661		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2662	2780	for (int i=0; i<group.selection.size(); i++)
2663	2781	{
2664		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2665	2787	}
2666	2788
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2670	2800	} else
2671	2801	if (source == genUVItem)
2672	2802	{
..	..	@@ -3258,6 +3388,12 @@
3258	3388	} else
3259	3389	if (source == editItem \|\| source == editButton)
3260	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
3261	3397	EditSelection(false);
3262	3398	} else
3263	3399	if (source == uneditButton)
..	..	@@ -3267,6 +3403,7 @@
3267	3403	Object3D child = (Object3D)e.nextElement();
3268	3404	if(child.editWindow != null)
3269	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
3270	3407	child.CloseUI();
3271	3408	listUI.remove(child);
3272	3409
..	..	@@ -3283,6 +3420,7 @@
3283	3420	//copy.ClearUI();
3284	3421	for (Object3D obj : listUI)
3285	3422	{
	3423	+ obj.pinned = false;
3286	3424	obj.CloseUI();
3287	3425	}
3288	3426	listUI.clear();
..	..	@@ -3292,7 +3430,7 @@
3292	3430	{
3293	3431	assert(copy == group);
3294	3432
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3434
3297	3435	for (Object3D obj : listUI)
3298	3436	{
..	..	@@ -3367,6 +3505,11 @@
3367	3505	currentLayout = sevenButton;
3368	3506	*/
3369	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
3370	3513	keepparent = group.parent;
3371	3514	// PARENT = NULL or not???
3372	3515	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3523,7 @@
3380	3523	cameraView.ProtectCamera();
3381	3524	cameraView.repaint();
3382	3525	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3527	{
3385	3528	cameraView.RevertCamera();
3386	3529	cameraView.repaint();
..	..	@@ -4434,10 +4577,6 @@
4434	4577	// }
4435	4578	// }
4436	4579
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4580	void EditSelection(boolean newWindow)
4442	4581	{
4443	4582	// aConstraints.gridy = 0;
..	..	@@ -4530,7 +4669,8 @@
4530	4669	//new Exception().printStackTrace();
4531	4670
4532	4671	freezemodel = true;
4533		-
	4672	+ ClearUnpinned();
	4673	+
4534	4674	/**/
4535	4675	//switch (event.id)
4536	4676	{
..	..	@@ -4563,7 +4703,7 @@
4563	4703	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4704	// a camera
4565	4705	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4707	{
4568	4708	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4709	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4712,13 @@
4572	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4713	}
4574	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4575	4722	refreshContents();
4576	4723	//return true;
4577	4724	}
..	..	@@ -4581,9 +4728,18 @@
4581	4728	freezemodel = false;
4582	4729	}
4583	4730
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
4584	4739	void refreshContents(boolean cp)
4585	4740	{
4586		- if (!Globals.MOUSEDRAGGED)
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	4743	{
4588	4744	objEditor.ClearInfo(); // .GetMaterial());
4589	4745
..	..	@@ -4682,8 +4838,8 @@
4682	4838
4683	4839	if (cut)
4684	4840	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4687	4843	//int indices[] = jList.getSelectedIndices();
4688	4844	//for (int i = indices.length - 1; i >= 0; i--)
4689	4845	//jList.remove(indices[i]);
..	..	@@ -4786,6 +4942,10 @@
4786	4942
4787	4943	void paste(boolean expand)
4788	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4789	4949	// if (GrafreeD.clipboard == null)
4790	4950	// return;
4791	4951	boolean first = true;
..	..	@@ -4845,6 +5005,7 @@
4845	5005	Grafreed.clipboard.get(0).parent = keepparent;
4846	5006	}
4847	5007
	5008	+ Globals.SAVEONMAKE = keep;
4848	5009	ResetModel();
4849	5010	refreshContents();
4850	5011	}
..	..	@@ -4980,6 +5141,10 @@
4980	5141
4981	5142	void group(Object3D csg, boolean grab)
4982	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4983	5148	if (//false) // why??
4984	5149	!group.selection.isEmpty())
4985	5150	{
..	..	@@ -5093,10 +5258,15 @@
5093	5258	//node.add(csg);
5094	5259	//makeSomething(node);
5095	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
5096	5262	}
5097	5263
5098	5264	void Ungroup(Object3D g)
5099	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
5100	5270	if (g instanceof HiddenObject)
5101	5271	{
5102	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5283,7 @@
5113	5283	objEditor.makeSomething(g.get(i), false);
5114	5284	}
5115	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
5116	5287	}
5117	5288
5118	5289	void ungroup()
..	..	@@ -5401,17 +5572,17 @@
5401	5572	cButton clearpanelButton;
5402	5573	cButton unselectButton;
5403	5574
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5575	+ cButton restoreCameraButton;
	5576	+
5409	5577	cButton saveButton;
5410	5578	cButton oneStepButton;
5411	5579
5412	5580	cButton groupButton;
5413	5581	cButton ungroupButton;
5414	5582	cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
5415	5586
5416	5587	cButton gridButton;
5417	5588	cButton boxButton;
..	..	@@ -5444,7 +5615,7 @@
5444	5615	//JTree jTree;
5445	5616	private MenuItem lookAtItem;
5446	5617	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
5448	5619	private MenuItem cutItem;
5449	5620	private MenuItem undoItem;
5450	5621	private MenuItem redoItem;
..	..	@@ -5536,7 +5707,7 @@
5536	5707	private MenuItem frontItem;
5537	5708	private MenuItem cameraItem;
5538	5709	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5540	5711	private MenuItem physicsItem;
5541	5712	private MenuItem frameselectorItem;
5542	5713	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5781,5 @@
5610	5781
5611	5782	Menu cameraMenu;
5612	5783	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5784	+ MenuItem restoreCameraItem;
5614	5785	}