~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,7 +31,7 @@
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49	49	row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,10 +330,19 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
..	..	@@ -350,7 +359,23 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
354	379	}
355	380
356	381	//ObjEditor objEditor;
..	..	@@ -394,6 +419,8 @@
394	419	{
395	420	copy.versionlist = new Object3D[100];
396	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
397	424	}
398	425
399	426	if(ui)
..	..	@@ -513,32 +540,37 @@
513	540	// menu.add("-");
514	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	542	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	545	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
519	547	{
520	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	549	cloneSupportItem.addActionListener(this);
522	550	}
	551	+ oe.jTree.popup.addSeparator();
523	552	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	554	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	556	copyItem.addActionListener(this);
528	557	pasteItem = menu.add(new MenuItem("Paste"));
529	558	pasteItem.addActionListener(this);
530	559
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	563	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	565	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	567	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
539	569	// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
542	574	deleteItem.addActionListener(this);
543	575
544	576	if (Globals.ADVANCED)
..	..	@@ -625,11 +657,9 @@
625	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	660	oe.cameraMenu.add("-");
630	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	662	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	663	lookAtItem.addActionListener(this);
634	664	//lookFromItem.addActinoListener(this);
635	665	//switchViewItem.addActionListener(this);
..	..	@@ -691,7 +721,7 @@
691	721	hideItem = menu.add(new MenuItem("Hidden Group"));
692	722	hideItem.addActionListener(this);
693	723	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	725	ungroupItem.addActionListener(this);
696	726
697	727	// menu.add("-");
..	..	@@ -877,6 +907,9 @@
877	907	shareGeometriesItem.addActionListener(this);
878	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
880	913	if (Globals.ADVANCED)
881	914	{
882	915	// Pretty much the same as duplicate and clone.
..	..	@@ -900,6 +933,7 @@
900	933	int tabcount = 0;
901	934	int colcount = 0;
902	935	int rowcount = 0;
	936	+ int texturecount = 0;
903	937
904	938	int columns = 5;
905	939	int rows = 7;
..	..	@@ -909,26 +943,31 @@
909	943	for (int i = 0; i < path.length; i++)
910	944	System.out.print(path[i] + "/");
911	945	System.out.println();
912		- if (rowcount == 0)
	946	+
	947	+ if (//rowcount == 0 \|\|
	948	+ path.length == 1)
913	949	{
914	950	currenttab = new cGridBag();
915	951	added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	952	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	953	currenttab.setName(tabname);
918	954	rowcount = 1;
	955	+ colcount = 0;
	956	+ texturecount = 0;
919	957	}
920	958
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	959	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
922	960	{
923	961	if (!added)
924	962	{
925	963	added = true;
926	964	resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
928	966	resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
929	967	}
930	968
931		- AddTextureButton(path[0], path[1], currenttab);
	969	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	970	+
932	971	if (++colcount >= columns)
933	972	{
934	973	colcount = 0;
..	..	@@ -949,7 +988,7 @@
949	988
950	989	void CreateTexturePanel(cGridBag container)
951	990	{
952		- resourcecontainer = new JTabbedPane();
	991	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	992	container.add(resourcecontainer);
954	993
955	994	Grafreed.ParseResources("textures", this);
..	..	@@ -972,11 +1011,6 @@
972	1011	//new Exception().printStackTrace();
973	1012
974	1013	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1015
982	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,10 +1043,49 @@
1009	1043
1010	1044	if (Globals.ADVANCED)
1011	1045	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
1015	1049	}
	1050	+
	1051	+ cButton gcButton;
	1052	+
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
	1062	+
	1063	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ collapseButton.setToolTipText("Collapse toolbar");
	1065	+ collapseButton.addActionListener(this);
	1066	+
	1067	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1069	+ maximize3DButton.addActionListener(this);
	1070	+
	1071	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ twoButton.setToolTipText("Show 3D view only");
	1073	+ twoButton.addActionListener(this);
	1074	+ this.fullscreenLayout = twoButton;
	1075	+
	1076	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ threeButton.setToolTipText("Show controls and 3D view");
	1078	+ threeButton.addActionListener(this);
	1079	+ if (Globals.ADVANCED)
	1080	+ {
	1081	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ sixButton.setToolTipText("Show 3D view and controls");
	1083	+ sixButton.addActionListener(this);
	1084	+ }
	1085	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+// sevenButton.setToolTipText("3-column layout");
	1087	+// sevenButton.addActionListener(this);
	1088	+ //
1016	1089
1017	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018	1091	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1057,14 +1130,14 @@
1057	1130	nextVersionButton.addActionListener(this);
1058	1131	nextVersionButton.setEnabled(false);
1059	1132
1060		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061		- liveCB.setToolTipText("Enable animation");
1062		- liveCB.addItemListener(this);
1063		-
1064	1133	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065	1134	oneStepButton.setToolTipText("Animate one step forward");
1066	1135	oneStepButton.addActionListener(this);
1067	1136
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
1068	1141	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1142	fastCB.setToolTipText("Fast mode");
1070	1143	fastCB.addItemListener(this);
..	..	@@ -1091,21 +1164,6 @@
1091	1164
1092	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1166
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1167
1110	1168	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111	1169	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1121,7 +1179,7 @@
1121	1179
1122	1180	// INSERT
1123	1181	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1182	+ gridButton.setToolTipText("Create ground");
1125	1183	gridButton.addActionListener(this);
1126	1184
1127	1185	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1413,6 +1471,14 @@
1413	1471
1414	1472	void EditObject(Object3D obj)
1415	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
1416	1482	cRadio radioButton = new cRadio(obj.name);
1417	1483
1418	1484	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1803,7 +1869,12 @@
1803	1869	TreePath path;
1804	1870
1805	1871	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1872	+ Object[] objs = new Object[tp.getPathCount()];
	1873	+ for (int i=0; i<objs.length; i++)
	1874	+ {
	1875	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1876	+ }
	1877	+ path = new TreePath(objs);
1807	1878	}
1808	1879
1809	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2614,27 +2685,35 @@
2614	2685	} else
2615	2686	if (source == loopItem \|\| source == loopButton)
2616	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2617	2690	Composite csg = new GroupLeaf();
2618	2691	csg.count = 5;
2619		- group(csg);
2620	2692	Composite child = new cGroup("Branch");
2621	2693	csg.addChild(child);
2622	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2623	2697	} else
2624	2698	if (source == doubleItem)
2625	2699	{
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
2626	2702	Composite csg = new GroupLeaf("Fork");
2627	2703	csg.count = 5;
2628		- group(csg);
2629	2704	Composite child = new cGroup("Branch A");
2630	2705	csg.addChild(child);
2631	2706	child.addChild(csg);
2632	2707	child = new cGroup("Branch B");
2633	2708	csg.addChild(child);
2634	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2635	2712	} else
2636	2713	if (source == tripleItem)
2637	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2638	2717	Composite csg = new GroupLeaf("Trident");
2639	2718	csg.count = 4;
2640	2719	group(csg);
..	..	@@ -2647,6 +2726,7 @@
2647	2726	child = new cGroup();
2648	2727	csg.addChild(child);
2649	2728	child.addChild(csg);
	2729	+ }
2650	2730	} else
2651	2731	if (source == computeAOItem)
2652	2732	{
..	..	@@ -2696,6 +2776,18 @@
2696	2776	if (source == fullButton)
2697	2777	{
2698	2778	ToggleFullScreen();
	2779	+ } else
	2780	+ if (source == collapseButton)
	2781	+ {
	2782	+ this.expandedLayout = radio.layout;
	2783	+ CollapseToolbar();
	2784	+ } else
	2785	+ if (source == maximize3DButton)
	2786	+ {
	2787	+ this.expandedLayout = radio.layout;
	2788	+ radio.layout = twoButton;
	2789	+ Show3DView();
	2790	+ CollapseToolbar();
2699	2791	} else
2700	2792	if (source == previousVersionButton)
2701	2793	{
..	..	@@ -3270,22 +3362,34 @@
3270	3362	} else
3271	3363	if (source == ungroupItem \|\| source == ungroupButton)
3272	3364	{
3273		- boolean hasRoot = false;
	3365	+ boolean canUngroup = true;
3274	3366
3275	3367	for (int i=0; i<group.selection.size(); i++)
3276	3368	{
3277		- if (group.selection.get(i) == group)
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
3278	3372	{
3279		- hasRoot = true;
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
3280	3382	break;
3281	3383	}
3282	3384	}
3283	3385
3284		- if (!hasRoot)
	3386	+ if (canUngroup)
3285	3387	{
3286	3388	for (int i=0; i<group.selection.size(); i++)
3287	3389	{
3288		- Ungroup(group.selection.get(i));
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
3289	3393	}
3290	3394
3291	3395	ClearSelection(false);
..	..	@@ -3648,38 +3752,7 @@
3648	3752	if (CameraPane.FULLSCREEN)
3649	3753	fullscreenLayout = radio.layout;
3650	3754
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3755	+ Show3DView();
3683	3756
3684	3757	cameraView.requestFocusInWindow();
3685	3758
..	..	@@ -3865,6 +3938,7 @@
3865	3938	} else
3866	3939	if (source == rootButton)
3867	3940	{
	3941	+ Replace();
3868	3942	Object3D obj;
3869	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3944	{
..	..	@@ -4001,8 +4075,6 @@
4001	4075
4002	4076	copy = group;
4003	4077
4004		- SetUndoStates();
4005		-
4006	4078	//Globals.theRenderer.object = group;
4007	4079	if(!useclient)
4008	4080	{
..	..	@@ -4030,6 +4102,18 @@
4030	4102	*/
4031	4103	radio.layout.doClick();
4032	4104
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
4033	4117	ClearUnpinned();
4034	4118
4035	4119	//Grafreed.Assert(group != null);
..	..	@@ -5264,6 +5348,20 @@
5264	5348	flashSelectionButton.setEnabled(enabled);
5265	5349
5266	5350	clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
5267	5365	}
5268	5366
5269	5367	void refreshContents(boolean cp)
..	..	@@ -5278,7 +5376,7 @@
5278	5376	Object3D child = (Object3D) group.selection.get(i);
5279	5377
5280	5378	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
5282	5380	}
5283	5381
5284	5382	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6259,11 @@
6161	6259	private MenuItem lookAtItem;
6162	6260	private MenuItem lookFromItem;
6163	6261	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
6165	6263	private MenuItem undoItem;
6166	6264	private MenuItem redoItem;
6167	6265	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
6169	6267	private MenuItem cloneSupportItem;
6170	6268	private MenuItem overwriteGeoItem;
6171	6269	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6284,13 @@
6186	6284	private MenuItem cloneGeometriesItem;
6187	6285	private MenuItem shareGeometriesItem;
6188	6286	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
6190	6288	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
6196	6294	private MenuItem clearAllItem;
6197	6295	private MenuItem genUVItem;
6198	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -6260,7 +6358,7 @@
6260	6358	private MenuItem switchTransfoItem;
6261	6359	private MenuItem morphItem;
6262	6360	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
6264	6362	private MenuItem editItem;
6265	6363	private MenuItem openWindowItem;
6266	6364	private MenuItem editLeafItem;