~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = 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.REPLACEONMAKE = 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"));
..	..	@@ -540,6 +544,7 @@
540	544	buildToolsMenu(menu);
541	545	}
542	546
	547	+
543	548	void SetupUI2(ObjEditor oe)
544	549	{
545	550	// June 2019
..	..	@@ -582,53 +587,79 @@
582	587	oe.radioPanel.add(dummyButton);
583	588	oe.buttonGroup.add(dummyButton);
584	589	*/
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
	593	+
585	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
586	595
587	596	//oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
588	597	//minButton.setToolTipText("Minimize window");
589	598	//minButton.addActionListener(this);
590	599
591		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
592		- maxButton.setToolTipText("Maximize window");
593		- maxButton.addActionListener(this);
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
594	606
595	607	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	608	fullButton.setToolTipText("Full-screen window");
597	609	fullButton.addActionListener(this);
598	610
599		- oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600		- undoButton.setToolTipText("Undo changes");
601		- undoButton.addActionListener(this);
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ screenfitButton.setToolTipText("Screen fit");
	613	+ screenfitButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
602	618
603		- oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
604		- redoButton.setToolTipText("Redo changes");
605		- redoButton.addActionListener(this);
606		-
607		- oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608		- saveButton.setToolTipText("Save changes");
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
609	621	saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
610	627
611		- oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
612	647	liveCB.setToolTipText("Enable animation");
613	648	liveCB.addItemListener(this);
614	649
615		- oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
616	651	oneStepButton.setToolTipText("Animate one step forward");
617	652	oneStepButton.addActionListener(this);
618	653
619		- oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
620	655	fastCB.setToolTipText("Fast mode");
621	656	fastCB.addItemListener(this);
622	657
623		- oe.toolboxPanel.Return();
	658	+ //oe.toolboxPanel.Return();
624	659
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);
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
632	663
633	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
634	665	// screenfitpointButton.addActionListener(this);
..	..	@@ -640,10 +671,6 @@
640	671	snapobjectButton.setToolTipText("Snap Object");
641	672	}
642	673
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	674	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
648	675
649	676	oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -688,8 +715,6 @@
688	715	sphereButton.setToolTipText("Create sphere");
689	716	sphereButton.addActionListener(this);
690	717
691		- oe.toolboxPanel.Return();
692		-
693	718	oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694	719	coneButton.setToolTipText("Create cone");
695	720	coneButton.addActionListener(this);
..	..	@@ -713,6 +738,28 @@
713	738	particlesButton.setToolTipText("Create particle system");
714	739	particlesButton.addActionListener(this);
715	740
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
716	763	oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
717	764	overlayButton.setToolTipText("Create overlay");
718	765	overlayButton.addActionListener(this);
..	..	@@ -721,17 +768,29 @@
721	768	lightButton.setToolTipText("Create light");
722	769	lightButton.addActionListener(this);
723	770
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
724	783	// EDIT panel
725		- editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
726		- editButton.setToolTipText("Edit selection");
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
727	786	editButton.addActionListener(this);
728	787
729		- editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730		- uneditButton.setToolTipText("Unedit selection");
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
731	790	uneditButton.addActionListener(this);
732	791
733	792	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
734		- allParamsButton.setToolTipText("Edit all params");
	793	+ allParamsButton.setToolTipText("Show all controle");
735	794	allParamsButton.addActionListener(this);
736	795
737	796	editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -742,8 +801,13 @@
742	801	unselectButton.setToolTipText("Unselect");
743	802	unselectButton.addActionListener(this);
744	803
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
	807	+
745	808	editCommandsPanel.preferredHeight = 1;
746	809
	810	+ SetPinStates(false);
747	811	// oe.treePanel.add(commandsPanel);
748	812	// oe.treePanel.Return();
749	813
..	..	@@ -768,23 +832,11 @@
768	832	oe.treePanel.add(jSPPanel);
769	833	oe.treePanel.Return();
770	834
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	835	oe.treePanel.add(copyOptionsPanel);
787	836	oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
788	840
789	841	// mainPanel.setDividerLocation(0.5); //1.0);
790	842	// mainPanel.setResizeWeight(0.5);
..	..	@@ -813,23 +865,43 @@
813	865
814	866	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
815	867	{
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
	871	+
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
816	882	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
817	883	boxCB.setToolTipText("Display bounding boxes");
818	884	boxCB.addItemListener(this);
819	885
820	886	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
821		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
822	888	zoomBoxCB.addItemListener(this);
823	889
824	890	if (true) // Globals.ADVANCED)
825	891	{
826		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
827		- supportCB.setToolTipText("Enable rigging");
828		- supportCB.addItemListener(this);
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
829	899
830	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
831	901	// localCB.addItemListener(this);
832	902
	903	+ panel.Return();
	904	+
833	905	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
834	906	crowdCB.setToolTipText("Used for crowds");
835	907	crowdCB.addItemListener(this);
..	..	@@ -846,6 +918,8 @@
846	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
847	919	// speakerMocapCB.addItemListener(this);
848	920
	921	+ panel.Return();
	922	+
849	923	if (false)
850	924	{
851	925	// handled in scripts
..	..	@@ -860,24 +934,39 @@
860	934	//constraints.gridy += 1;
861	935	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
862	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
863	938	}
864	939
865	940	//constraints.gridx += 1;
866	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
867	942	// debugCB.addItemListener(this);
868	943
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
869	948	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
870		- oeilCB.setToolTipText("Move camera when tracking target");
	949	+ oeilCB.setToolTipText("Move camera when tracking");
871	950	oeilCB.addItemListener(this);
872	951
873	952	panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
874		- shadowCB.setToolTipText("Compute shadows when live");
	953	+ shadowCB.setToolTipText("When live compute shadows");
875	954	shadowCB.addItemListener(this);
876	955
877		- panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
878		- autosaveCB.setToolTipText("Auto-save on structure change");
879		- autosaveCB.addItemListener(this);
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
880	968
	969	+ panel.Return();
881	970	if (Globals.ADVANCED)
882	971	{
883	972	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
..	..	@@ -888,10 +977,15 @@
888	977	}
889	978
890	979	cGridBag fill = new cGridBag();
891		-
892	980	fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
893	985
894	986	panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
895	989
896	990	}
897	991
..	..	@@ -899,7 +993,7 @@
899	993	{
900	994	cRadio radioButton = new cRadio(obj.name);
901	995
902		- // Patch to avoid bug with transparency.
	996	+ // June 2019. Patch to avoid bug with transparency.
903	997	radioButton.hadMaterial = obj.material != null;
904	998	if (!radioButton.hadMaterial)
905	999	{
..	..	@@ -936,7 +1030,9 @@
936	1030	cCheckBox slowCB;
937	1031	cCheckBox boxCB;
938	1032	cCheckBox zoomBoxCB;
939		- cToggleButton trackCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
940	1036	cCheckBox smoothfocusCB;
941	1037	// JCheckBox speakerMocapCB;
942	1038	cCheckBox speakerCameraCB;
..	..	@@ -945,7 +1041,7 @@
945	1041
946	1042	cCheckBox oeilCB;
947	1043	cCheckBox shadowCB;
948		- cCheckBox autosaveCB;
	1044	+ cCheckBox autokeepCB;
949	1045	cCheckBox lookAtCB;
950	1046
951	1047	// static int COLOR = 1;
..	..	@@ -1053,9 +1149,13 @@
1053	1149	{
1054	1150	Globals.COMPUTESHADOWWHENLIVE ^= true;
1055	1151	}
1056		- else if(e.getSource() == autosaveCB)
	1152	+ else if(e.getSource() == freezeCB)
1057	1153	{
1058		- Globals.SAVEONMAKE ^= true;
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
1059	1159	}
1060	1160	else if(e.getSource() == lookAtCB)
1061	1161	{
..	..	@@ -1137,8 +1237,6 @@
1137	1237	}
1138	1238	}
1139	1239
1140		- String string = (String) object;
1141		-
1142	1240	System.out.println("Transfer = " + object + "; drop : " + target);
1143	1241	// if( object instanceof java.io.File[])
1144	1242	// {
..	..	@@ -1146,6 +1244,8 @@
1146	1244	// objEditor.DropFile((java.io.File[]) object, true);
1147	1245	// return;
1148	1246	// }
	1247	+
	1248	+ String string = object.toString();
1149	1249
1150	1250	// File path for Mac and Windows
1151	1251	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1191,13 +1291,23 @@
1191	1291
1192	1292	assert target == objEditor.jTree;
1193	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
1194	1295	try {
1195		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1196	1297	} catch (Exception e) {
1197	1298	System.out.println("destinationPath : " + destinationPath);
1198	1299	return;
1199	1300	}
1200	1301
	1302	+ for (int i=group.selection.size(); --i>=0;)
	1303	+ {
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
1201	1311	// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
1202	1312	// {
1203	1313	loadClipboard(true);
..	..	@@ -1312,22 +1422,30 @@
1312	1422	{
1313	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1314	1424	//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);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
1327	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1328	1444	kleinItem.addActionListener(this);
1329		- particleItem = menu.add(new MenuItem("Particle system"));
1330		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
1331	1449	if (Globals.ADVANCED)
1332	1450	{
1333	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1353,15 +1471,15 @@
1353	1471	}
1354	1472	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1355	1473	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);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1360	1478	menu.add("-");
1361	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1362	1480	//superLoopItem.addActionListener(this);
1363		- loopItem = menu.add(new MenuItem("Loop"));
1364		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1365	1483	doubleItem = menu.add(new MenuItem("Fork"));
1366	1484	doubleItem.addActionListener(this);
1367	1485	if (Globals.ADVANCED)
..	..	@@ -1377,6 +1495,9 @@
1377	1495	animationItem.addItemListener(this);
1378	1496	animationItem.setState(Globals.ANIMATION);
1379	1497
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
	1500	+
1380	1501	menu.add("-");
1381	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1382	1503	parseverticesItem.addActionListener(this);
..	..	@@ -1389,6 +1510,8 @@
1389	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1390	1511	reduce34MorphItem.addActionListener(this);
1391	1512	menu.add("-");
	1513	+ menu.add(memoryItem = new MenuItem("Memory Usage"));
	1514	+ memoryItem.addActionListener(this);
1392	1515	menu.add(computeAOItem = new MenuItem("Compute AO"));
1393	1516	computeAOItem.addActionListener(this);
1394	1517
..	..	@@ -1397,8 +1520,6 @@
1397	1520	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1398	1521	mirrorItem.addActionListener(this);
1399	1522	menu.add("-");
1400		- menu.add(memoryItem = new MenuItem("Memory Usage"));
1401		- memoryItem.addActionListener(this);
1402	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1403	1524	analyzeItem.addActionListener(this);
1404	1525	menu.add(dumpItem = new MenuItem("Print"));
..	..	@@ -1546,6 +1667,20 @@
1546	1667
1547	1668	makeSomething(shadow);
1548	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1549	1684
1550	1685	/**
1551	1686	* applyExample
..	..	@@ -1790,7 +1925,7 @@
1790	1925	{
1791	1926	ScreenFit();
1792	1927	} else
1793		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1794	1929	{
1795	1930	cVector v1 = new cVector();
1796	1931	cVector v2 = new cVector();
..	..	@@ -2020,30 +2155,30 @@
2020	2155
2021	2156	group(g);
2022	2157	} else
2023		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
2024	2159	{
2025	2160	Composite csg = new GroupLeaf();
2026	2161	csg.count = 5;
2027	2162	group(csg);
2028		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
2029	2164	csg.addChild(child);
2030	2165	child.addChild(csg);
2031	2166	} else
2032	2167	if (source == doubleItem)
2033	2168	{
2034		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
2035	2170	csg.count = 5;
2036	2171	group(csg);
2037		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
2038	2173	csg.addChild(child);
2039	2174	child.addChild(csg);
2040		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
2041	2176	csg.addChild(child);
2042	2177	child.addChild(csg);
2043	2178	} else
2044	2179	if (source == tripleItem)
2045	2180	{
2046		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
2047	2182	csg.count = 4;
2048	2183	group(csg);
2049	2184	Composite child = new cGroup();
..	..	@@ -2107,15 +2242,31 @@
2107	2242	} else
2108	2243	if (source == undoButton)
2109	2244	{
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
2110	2248	Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
2111	2259	} else
2112	2260	if (source == redoButton)
2113	2261	{
	2262	+ // Go to next version
2114	2263	Redo();
2115	2264	} else
2116	2265	if (source == saveButton)
2117	2266	{
2118		- Save();
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
2119	2270	} else
2120	2271	if (source == oneStepButton)
2121	2272	{
..	..	@@ -2124,17 +2275,14 @@
2124	2275	} else
2125	2276	if (source == screenfitButton)
2126	2277	{
2127		- //Reload(lastConverter, lastFilename, true);
2128	2278	ScreenFit();
2129	2279	} else
2130	2280	if (source == screenfitpointButton)
2131	2281	{
2132		- //Reload(lastConverter, lastFilename, true);
2133	2282	ScreenFitPoint();
2134	2283	} else
2135	2284	if (source == snapobjectButton)
2136	2285	{
2137		- //Reload(lastConverter, lastFilename, true);
2138	2286	SnapObject();
2139	2287	} else
2140	2288	// if (event.getSource() == recompileButton)
..	..	@@ -2510,9 +2658,9 @@
2510	2658	{
2511	2659	ClearSelection(true);
2512	2660	} else
2513		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2514	2662	{
2515		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2516	2664	} else
2517	2665	if (source == hideItem)
2518	2666	{
..	..	@@ -2530,11 +2678,11 @@
2530	2678	{
2531	2679	makeSomething(new Camera());
2532	2680	} else
2533		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2534	2682	{
2535	2683	group(new Composite());
2536	2684	} else
2537		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2538	2686	{
2539	2687	RandomNode random = new RandomNode();
2540	2688	group(random);
..	..	@@ -2636,7 +2784,7 @@
2636	2784	{
2637	2785	group(new cLinker());
2638	2786	} else
2639		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2640	2788	{
2641	2789	group(new TextureNode());
2642	2790	} else
..	..	@@ -2658,15 +2806,28 @@
2658	2806	} else
2659	2807	if (source == ungroupItem \|\| source == ungroupButton)
2660	2808	{
2661		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2662	2811	for (int i=0; i<group.selection.size(); i++)
2663	2812	{
2664		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2665	2818	}
2666	2819
2667		- ClearSelection(false);
2668		-
2669		- refreshContents();
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2670	2831	} else
2671	2832	if (source == genUVItem)
2672	2833	{
..	..	@@ -3258,6 +3419,12 @@
3258	3419	} else
3259	3420	if (source == editItem \|\| source == editButton)
3260	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
3261	3428	EditSelection(false);
3262	3429	} else
3263	3430	if (source == uneditButton)
..	..	@@ -3267,6 +3434,7 @@
3267	3434	Object3D child = (Object3D)e.nextElement();
3268	3435	if(child.editWindow != null)
3269	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
3270	3438	child.CloseUI();
3271	3439	listUI.remove(child);
3272	3440
..	..	@@ -3283,6 +3451,7 @@
3283	3451	//copy.ClearUI();
3284	3452	for (Object3D obj : listUI)
3285	3453	{
	3454	+ obj.pinned = false;
3286	3455	obj.CloseUI();
3287	3456	}
3288	3457	listUI.clear();
..	..	@@ -3292,7 +3461,7 @@
3292	3461	{
3293	3462	assert(copy == group);
3294	3463
3295		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3296	3465
3297	3466	for (Object3D obj : listUI)
3298	3467	{
..	..	@@ -3341,6 +3510,9 @@
3341	3510	}
3342	3511
3343	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
3344	3516	//Globals.theRenderer.object = group;
3345	3517	if(!useclient)
3346	3518	{
..	..	@@ -3367,6 +3539,11 @@
3367	3539	currentLayout = sevenButton;
3368	3540	*/
3369	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3370	3547	keepparent = group.parent;
3371	3548	// PARENT = NULL or not???
3372	3549	//group.parent = null; // ROOT
..	..	@@ -3380,7 +3557,7 @@
3380	3557	cameraView.ProtectCamera();
3381	3558	cameraView.repaint();
3382	3559	return;
3383		- } else if (event.getSource() == revertCameraItem)
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3384	3561	{
3385	3562	cameraView.RevertCamera();
3386	3563	cameraView.repaint();
..	..	@@ -4434,10 +4611,6 @@
4434	4611	// }
4435	4612	// }
4436	4613
4437		- static boolean allparams = true;
4438		-
4439		- static Vector<Object3D> listUI = new Vector<Object3D>();
4440		-
4441	4614	void EditSelection(boolean newWindow)
4442	4615	{
4443	4616	// aConstraints.gridy = 0;
..	..	@@ -4530,7 +4703,8 @@
4530	4703	//new Exception().printStackTrace();
4531	4704
4532	4705	freezemodel = true;
4533		-
	4706	+ ClearUnpinned();
	4707	+
4534	4708	/**/
4535	4709	//switch (event.id)
4536	4710	{
..	..	@@ -4563,7 +4737,7 @@
4563	4737	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4564	4738	// a camera
4565	4739	{
4566		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4567	4741	{
4568	4742	CameraPane.camerachangeframe = 0; // don't refuse it
4569	4743	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4572,6 +4746,13 @@
4572	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4573	4747	}
4574	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4575	4756	refreshContents();
4576	4757	//return true;
4577	4758	}
..	..	@@ -4581,9 +4762,18 @@
4581	4762	freezemodel = false;
4582	4763	}
4583	4764
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
4584	4773	void refreshContents(boolean cp)
4585	4774	{
4586		- if (!Globals.MOUSEDRAGGED)
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4587	4777	{
4588	4778	objEditor.ClearInfo(); // .GetMaterial());
4589	4779
..	..	@@ -4682,8 +4872,8 @@
4682	4872
4683	4873	if (cut)
4684	4874	{
4685		- if (Globals.SAVEONMAKE)
4686		- Save();
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4687	4877	//int indices[] = jList.getSelectedIndices();
4688	4878	//for (int i = indices.length - 1; i >= 0; i--)
4689	4879	//jList.remove(indices[i]);
..	..	@@ -4786,6 +4976,10 @@
4786	4976
4787	4977	void paste(boolean expand)
4788	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4789	4983	// if (GrafreeD.clipboard == null)
4790	4984	// return;
4791	4985	boolean first = true;
..	..	@@ -4845,6 +5039,7 @@
4845	5039	Grafreed.clipboard.get(0).parent = keepparent;
4846	5040	}
4847	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4848	5043	ResetModel();
4849	5044	refreshContents();
4850	5045	}
..	..	@@ -4980,6 +5175,10 @@
4980	5175
4981	5176	void group(Object3D csg, boolean grab)
4982	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4983	5182	if (//false) // why??
4984	5183	!group.selection.isEmpty())
4985	5184	{
..	..	@@ -5093,10 +5292,15 @@
5093	5292	//node.add(csg);
5094	5293	//makeSomething(node);
5095	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
5096	5296	}
5097	5297
5098	5298	void Ungroup(Object3D g)
5099	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
5100	5304	if (g instanceof HiddenObject)
5101	5305	{
5102	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -5113,6 +5317,7 @@
5113	5317	objEditor.makeSomething(g.get(i), false);
5114	5318	}
5115	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
5116	5321	}
5117	5322
5118	5323	void ungroup()
..	..	@@ -5401,17 +5606,17 @@
5401	5606	cButton clearpanelButton;
5402	5607	cButton unselectButton;
5403	5608
5404		- cButton minButton;
5405		- cButton maxButton;
5406		- cButton fullButton;
5407		- cButton undoButton;
5408		- cButton redoButton;
	5609	+ cButton restoreCameraButton;
	5610	+
5409	5611	cButton saveButton;
5410	5612	cButton oneStepButton;
5411	5613
5412	5614	cButton groupButton;
5413	5615	cButton ungroupButton;
5414	5616	cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
5415	5620
5416	5621	cButton gridButton;
5417	5622	cButton boxButton;
..	..	@@ -5444,7 +5649,7 @@
5444	5649	//JTree jTree;
5445	5650	private MenuItem lookAtItem;
5446	5651	private MenuItem lookFromItem;
5447		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5448	5653	private MenuItem cutItem;
5449	5654	private MenuItem undoItem;
5450	5655	private MenuItem redoItem;
..	..	@@ -5536,7 +5741,7 @@
5536	5741	private MenuItem frontItem;
5537	5742	private MenuItem cameraItem;
5538	5743	private MenuItem compositeItem;
5539		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5540	5745	private MenuItem physicsItem;
5541	5746	private MenuItem frameselectorItem;
5542	5747	private MenuItem scriptNodeItem;
..	..	@@ -5610,5 +5815,5 @@
5610	5815
5611	5816	Menu cameraMenu;
5612	5817	MenuItem editCameraItem;
5613		- MenuItem revertCameraItem;
	5818	+ MenuItem restoreCameraItem;
5614	5819	}