~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
..	..	@@ -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)
..	..	@@ -357,6 +366,16 @@
357	366	}
358	367
359	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();
360	379	}
361	380
362	381	//ObjEditor objEditor;
..	..	@@ -400,6 +419,8 @@
400	419	{
401	420	copy.versionlist = new Object3D[100];
402	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
403	424	}
404	425
405	426	if(ui)
..	..	@@ -519,32 +540,37 @@
519	540	// menu.add("-");
520	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	542	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	545	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
525	547	{
526	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	549	cloneSupportItem.addActionListener(this);
528	550	}
	551	+ oe.jTree.popup.addSeparator();
529	552	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	554	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	556	copyItem.addActionListener(this);
534	557	pasteItem = menu.add(new MenuItem("Paste"));
535	558	pasteItem.addActionListener(this);
536	559
537		- menu.add("-");
538		- 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"));
539	563	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	565	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	567	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545	569	// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
548	574	deleteItem.addActionListener(this);
549	575
550	576	if (Globals.ADVANCED)
..	..	@@ -631,11 +657,9 @@
631	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	660	oe.cameraMenu.add("-");
636	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	662	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	663	lookAtItem.addActionListener(this);
640	664	//lookFromItem.addActinoListener(this);
641	665	//switchViewItem.addActionListener(this);
..	..	@@ -697,7 +721,7 @@
697	721	hideItem = menu.add(new MenuItem("Hidden Group"));
698	722	hideItem.addActionListener(this);
699	723	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	725	ungroupItem.addActionListener(this);
702	726
703	727	// menu.add("-");
..	..	@@ -883,6 +907,9 @@
883	907	shareGeometriesItem.addActionListener(this);
884	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
886	913	if (Globals.ADVANCED)
887	914	{
888	915	// Pretty much the same as duplicate and clone.
..	..	@@ -913,9 +940,9 @@
913	940
914	941	public void ResourceCallBack(String[] path)
915	942	{
916		-// for (int i = 0; i < path.length; i++)
917		-// System.out.print(path[i] + "/");
918		-// System.out.println();
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
919	946
920	947	if (//rowcount == 0 \|\|
921	948	path.length == 1)
..	..	@@ -984,11 +1011,6 @@
984	1011	//new Exception().printStackTrace();
985	1012
986	1013	oe.radioPanel = new JPanel(new GridBagLayout());
987		- oe.aConstraints.weightx = 1;
988		- oe.aConstraints.weighty = 0;
989		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
990		- oe.aConstraints.gridwidth = 100;
991		- oe.aConstraints.gridheight = 1;
992	1014	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1015
994	1016	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1021,10 +1043,49 @@
1021	1043
1022	1044	if (Globals.ADVANCED)
1023	1045	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- 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);
1027	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	+ //
1028	1089
1029	1090	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030	1091	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1069,14 +1130,14 @@
1069	1130	nextVersionButton.addActionListener(this);
1070	1131	nextVersionButton.setEnabled(false);
1071	1132
1072		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073		- liveCB.setToolTipText("Enable animation");
1074		- liveCB.addItemListener(this);
1075		-
1076	1133	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077	1134	oneStepButton.setToolTipText("Animate one step forward");
1078	1135	oneStepButton.addActionListener(this);
1079	1136
	1137	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1138	+ liveCB.setToolTipText("Enable animation");
	1139	+ liveCB.addItemListener(this);
	1140	+
1080	1141	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1142	fastCB.setToolTipText("Fast mode");
1082	1143	fastCB.addItemListener(this);
..	..	@@ -1103,21 +1164,6 @@
1103	1164
1104	1165	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1166
1106		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107		- twoButton.setToolTipText("Show 3D view only");
1108		- twoButton.addActionListener(this);
1109		- this.fullscreenLayout = twoButton;
1110		-
1111		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112		- threeButton.setToolTipText("Show controls and 3D view");
1113		- threeButton.addActionListener(this);
1114		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115		- sixButton.setToolTipText("Show 3D view and controls");
1116		- sixButton.addActionListener(this);
1117		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118		-// sevenButton.setToolTipText("3-column layout");
1119		-// sevenButton.addActionListener(this);
1120		- //
1121	1167
1122	1168	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123	1169	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1133,7 +1179,7 @@
1133	1179
1134	1180	// INSERT
1135	1181	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1182	+ gridButton.setToolTipText("Create ground");
1137	1183	gridButton.addActionListener(this);
1138	1184
1139	1185	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1425,6 +1471,14 @@
1425	1471
1426	1472	void EditObject(Object3D obj)
1427	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	+
1428	1482	cRadio radioButton = new cRadio(obj.name);
1429	1483
1430	1484	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1815,7 +1869,12 @@
1815	1869	TreePath path;
1816	1870
1817	1871	public TransferableTreePath(TreePath tp) {
1818		- 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);
1819	1878	}
1820	1879
1821	1880	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2626,27 +2685,35 @@
2626	2685	} else
2627	2686	if (source == loopItem \|\| source == loopButton)
2628	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2629	2690	Composite csg = new GroupLeaf();
2630	2691	csg.count = 5;
2631		- group(csg);
2632	2692	Composite child = new cGroup("Branch");
2633	2693	csg.addChild(child);
2634	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2635	2697	} else
2636	2698	if (source == doubleItem)
2637	2699	{
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
2638	2702	Composite csg = new GroupLeaf("Fork");
2639	2703	csg.count = 5;
2640		- group(csg);
2641	2704	Composite child = new cGroup("Branch A");
2642	2705	csg.addChild(child);
2643	2706	child.addChild(csg);
2644	2707	child = new cGroup("Branch B");
2645	2708	csg.addChild(child);
2646	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2647	2712	} else
2648	2713	if (source == tripleItem)
2649	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2650	2717	Composite csg = new GroupLeaf("Trident");
2651	2718	csg.count = 4;
2652	2719	group(csg);
..	..	@@ -2659,6 +2726,7 @@
2659	2726	child = new cGroup();
2660	2727	csg.addChild(child);
2661	2728	child.addChild(csg);
	2729	+ }
2662	2730	} else
2663	2731	if (source == computeAOItem)
2664	2732	{
..	..	@@ -2708,6 +2776,18 @@
2708	2776	if (source == fullButton)
2709	2777	{
2710	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();
2711	2791	} else
2712	2792	if (source == previousVersionButton)
2713	2793	{
..	..	@@ -3282,22 +3362,34 @@
3282	3362	} else
3283	3363	if (source == ungroupItem \|\| source == ungroupButton)
3284	3364	{
3285		- boolean hasRoot = false;
	3365	+ boolean canUngroup = true;
3286	3366
3287	3367	for (int i=0; i<group.selection.size(); i++)
3288	3368	{
3289		- if (group.selection.get(i) == group)
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
3290	3372	{
3291		- 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;
3292	3382	break;
3293	3383	}
3294	3384	}
3295	3385
3296		- if (!hasRoot)
	3386	+ if (canUngroup)
3297	3387	{
3298	3388	for (int i=0; i<group.selection.size(); i++)
3299	3389	{
3300		- Ungroup(group.selection.get(i));
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
3301	3393	}
3302	3394
3303	3395	ClearSelection(false);
..	..	@@ -3660,38 +3752,7 @@
3660	3752	if (CameraPane.FULLSCREEN)
3661	3753	fullscreenLayout = radio.layout;
3662	3754
3663		- // bug
3664		- //gridPanel.setDividerLocation(1.0);
3665		- //bigPanel.setDividerLocation(0.0);
3666		-// bigThree.remove(scenePanel);
3667		-// bigThree.remove(centralPanel);
3668		-// bigThree.remove(XYZPanel);
3669		-// aWindowConstraints.gridx = 0;
3670		-// aWindowConstraints.gridy = 0;
3671		-// aWindowConstraints.gridwidth = 1;
3672		-// // aConstraints.gridheight = 3;
3673		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674		-// aWindowConstraints.weightx = 0;
3675		-// aWindowConstraints.weighty = 1;
3676		-// //bigThree.add(jtp, aWindowConstraints);
3677		-// aWindowConstraints.weightx = 1;
3678		-// aWindowConstraints.gridwidth = 3;
3679		-// // aConstraints.gridheight = 3;
3680		-// aWindowConstraints.gridx = 1;
3681		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3682		-// bigThree.add(centralPanel, aWindowConstraints);
3683		-// aWindowConstraints.weightx = 0;
3684		-// aWindowConstraints.gridx = 4;
3685		-// aWindowConstraints.gridwidth = 1;
3686		-// // aConstraints.gridheight = 3;
3687		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3688		-// //bigThree.add(XYZPanel, aWindowConstraints);
3689		-// scenePanel.setVisible(false);
3690		-// centralPanel.setVisible(true);
3691		-// XYZPanel.setVisible(false);
3692		- bigThree.ClearUI();
3693		- bigThree.add(centralPanel);
3694		- bigThree.FlushUI();
	3755	+ Show3DView();
3695	3756
3696	3757	cameraView.requestFocusInWindow();
3697	3758
..	..	@@ -3877,6 +3938,7 @@
3877	3938	} else
3878	3939	if (source == rootButton)
3879	3940	{
	3941	+ Replace();
3880	3942	Object3D obj;
3881	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3944	{
..	..	@@ -4013,8 +4075,6 @@
4013	4075
4014	4076	copy = group;
4015	4077
4016		- SetUndoStates();
4017		-
4018	4078	//Globals.theRenderer.object = group;
4019	4079	if(!useclient)
4020	4080	{
..	..	@@ -4042,6 +4102,18 @@
4042	4102	*/
4043	4103	radio.layout.doClick();
4044	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	+
4045	4117	ClearUnpinned();
4046	4118
4047	4119	//Grafreed.Assert(group != null);
..	..	@@ -5276,6 +5348,20 @@
5276	5348	flashSelectionButton.setEnabled(enabled);
5277	5349
5278	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);
5279	5365	}
5280	5366
5281	5367	void refreshContents(boolean cp)
..	..	@@ -5290,7 +5376,7 @@
5290	5376	Object3D child = (Object3D) group.selection.get(i);
5291	5377
5292	5378	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5379	+// System.err.println("info : " + child.GetPath());
5294	5380	}
5295	5381
5296	5382	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6259,11 @@
6173	6259	private MenuItem lookAtItem;
6174	6260	private MenuItem lookFromItem;
6175	6261	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
6177	6263	private MenuItem undoItem;
6178	6264	private MenuItem redoItem;
6179	6265	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
6181	6267	private MenuItem cloneSupportItem;
6182	6268	private MenuItem overwriteGeoItem;
6183	6269	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6284,13 @@
6198	6284	private MenuItem cloneGeometriesItem;
6199	6285	private MenuItem shareGeometriesItem;
6200	6286	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
6202	6288	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
6208	6294	private MenuItem clearAllItem;
6209	6295	private MenuItem genUVItem;
6210	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -6272,7 +6358,7 @@
6272	6358	private MenuItem switchTransfoItem;
6273	6359	private MenuItem morphItem;
6274	6360	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
6276	6362	private MenuItem editItem;
6277	6363	private MenuItem openWindowItem;
6278	6364	private MenuItem editLeafItem;