~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,36 +163,48 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175	174	cutItem = menu.add(new MenuItem("Cut"));
176	175	cutItem.addActionListener(this);
177	176	copyItem = menu.add(new MenuItem("Copy"));
178	177	copyItem.addActionListener(this);
179	178	pasteItem = menu.add(new MenuItem("Paste"));
180	179	pasteItem.addActionListener(this);
	180	+ menu.add("-");
	181	+ cloneItem = menu.add(new MenuItem("Clone"));
	182	+ cloneItem.addActionListener(this);
	183	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	184	+ cloneSupportItem.addActionListener(this);
	185	+ menu.add("-");
	186	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	187	+ pasteIntoItem.addActionListener(this);
181	188	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	189	pasteLinkItem.addActionListener(this);
183	190	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	191	pasteCloneItem.addActionListener(this);
185	192	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	193	// pasteExpandItem.addActionListener(this);
	194	+ menu.add("-");
187	195	clearItem = menu.add(new MenuItem("Clear"));
188	196	clearItem.addActionListener(this);
	197	+
	198	+ if (Globals.ADVANCED)
	199	+ {
	200	+ // Deletes the cameras...
189	201	clearAllItem = menu.add(new MenuItem("Clear All"));
190	202	clearAllItem.addActionListener(this);
	203	+ }
191	204
192	205	oe.menuBar.add(menu = new Menu("Setting"));
	206	+ if (Globals.ADVANCED)
	207	+ {
193	208	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	209	resetMeshItem.addActionListener(this);
195	210	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +214,7 @@
199	214	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	215	resetreferencesItem.addActionListener(this);
201	216	menu.add("-");
	217	+ }
202	218	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	219	overwriteGeoItem.addActionListener(this);
204	220	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +226,26 @@
210	226	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	227	overwriteUVItem.addActionListener(this);
212	228	menu.add("-");
	229	+ if (Globals.ADVANCED)
	230	+ {
213	231	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	232	generateMeshItem.addActionListener(this);
215	233	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	234	poseMeshItem.addActionListener(this);
217	235	menu.add("-");
	236	+ }
218	237	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	238	resetsupportItem.addActionListener(this);
220	239	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	240	linkverticesItem.addActionListener(this);
222	241	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	242	relinkverticesItem.addActionListener(this);
	243	+
	244	+ if (Globals.ADVANCED)
	245	+ {
224	246	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	247	setMasterItem.addActionListener(this);
	248	+ }
226	249
227	250	oe.menuBar.add(menu = new Menu("Group"));
228	251	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +256,31 @@
233	256	frontItem.addActionListener(this);
234	257	compositeItem = menu.add(new MenuItem("Composite"));
235	258	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	259	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	260	hideItem.addActionListener(this);
238	261	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	262	ungroupItem.addActionListener(this);
240	263	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	264	+ randomItem = menu.add(new MenuItem("Switch node"));
242	265	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	266	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	267	switchGeoItem.addActionListener(this);
249	268	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	269	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	270	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	271	morphItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ physicsItem = menu.add(new MenuItem("Physics"));
	276	+ physicsItem.addActionListener(this);
	277	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	278	+ frameselectorItem.addActionListener(this);
253	279	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	280	scriptNodeItem.addActionListener(this);
255	281	cameraItem = menu.add(new MenuItem("Camera"));
256	282	cameraItem.addActionListener(this);
	283	+ }
257	284
258	285	oe.menuBar.add(menu = new Menu("Object"));
259	286	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,15 +295,18 @@
268	295	shadowYItem.addActionListener(this);
269	296	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	297	shadowZItem.addActionListener(this);
	298	+ if (Globals.ADVANCED)
	299	+ {
271	300	linkerItem = menu.add(new MenuItem("Linker"));
272	301	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	302	attributeItem = menu.add(new MenuItem("Attribute"));
276	303	attributeItem.addActionListener(this);
	304	+ templateItem = menu.add(new MenuItem("Template"));
	305	+ templateItem.addActionListener(this);
277	306	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	307	pointflowItem.addActionListener(this);
279	308	menu.add("-");
	309	+ }
280	310	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	311	resetTransformItem.addActionListener(this);
282	312	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
..	..	@@ -293,8 +323,11 @@
293	323	genNormalsCADItem.addActionListener(this);
294	324	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	325	genNormalsMESHItem.addActionListener(this);
	326	+ if (Globals.ADVANCED)
	327	+ {
296	328	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	329	genNormalsMINEItem.addActionListener(this);
	330	+ }
298	331	stripifyItem = menu.add(new MenuItem("Stripify"));
299	332	stripifyItem.addActionListener(this);
300	333	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,10 +349,14 @@
316	349	reduce34MeshItem.addActionListener(this);
317	350	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	351	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	352	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	353	clipMeshItem.addActionListener(this);
	354	+
	355	+ if (Globals.ADVANCED)
	356	+ {
	357	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	358	+ smoothMeshItem.addActionListener(this);
	359	+ }
323	360
324	361	oe.menuBar.add(menu = new Menu("Attributes"));
325	362	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -329,10 +366,13 @@
329	366	liveleavesItem.addActionListener(this);
330	367	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	368	unliveleavesItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
332	371	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	372	supportleavesItem.addActionListener(this);
334	373	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	374	unsupportleavesItem.addActionListener(this);
	375	+ }
336	376	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	377	hideleavesItem.addActionListener(this);
338	378	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -375,6 +415,8 @@
375	415	sortbysizeItem.addActionListener(this);
376	416	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	417	sortbynameItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
378	420	menu.add("-");
379	421	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	422	extractGeometriesItem.addActionListener(this);
..	..	@@ -384,11 +426,11 @@
384	426	shareGeometriesItem.addActionListener(this);
385	427	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386	428	mergeGeometriesItem.addActionListener(this);
	429	+ }
387	430
388	431	oe.menuBar.add(menu = new Menu("Insert"));
389	432	buildCreateMenu(menu);
390	433
391		-
392	434	oe.menuBar.add(menu = new Menu("Include"));
393	435	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394	436	importGFDItem.addActionListener(this);
..	..	@@ -433,176 +475,98 @@
433	475	oe.radioPanel.add(dummyButton);
434	476	oe.buttonGroup.add(dummyButton);
435	477	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	478	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	479
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	480	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
441	481	liveCB.setToolTipText("Enabled animation");
442	482	liveCB.addItemListener(this);
443	483
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	484	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	485	+ oneStepButton.setToolTipText("Animate one step forward");
	486	+ oneStepButton.addActionListener(this);
	487	+
	488	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
446	489	fastCB.setToolTipText("Fast mode");
447	490	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	491	+
	492	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
515	493	trackCB.setToolTipText("Enable tracking");
516	494	trackCB.addItemListener(this);
517	495
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	496	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
520	497	screenfitButton.setToolTipText("Screen fit");
521	498	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	499	+
523	500	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	501	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	502
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	503	+ if (Globals.ADVANCED)
	504	+ {
	505	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ snapobjectButton.addActionListener(this);
	507	+ snapobjectButton.setToolTipText("Snap Object");
	508	+ }
	509	+
	510	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
537	511	flashSelectionButton.setToolTipText("Show selection");
538	512	flashSelectionButton.addActionListener(this);
539	513
540		- oe.toolbarPanel.add(new cButton(" ", false));
	514	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	515
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	516	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
548	517	twoButton.setToolTipText("Show center view only");
549	518	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	519	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
551	520	fourButton.addActionListener(this);
552	521	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	522	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
554	523	sixButton.setToolTipText("2-column layout left");
555	524	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
557	526	threeButton.setToolTipText("2-column layout right");
558	527	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	528	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
560	529	sevenButton.setToolTipText("3-column layout");
561	530	sevenButton.addActionListener(this);
562	531	//
563	532
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	533	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ rootButton.setToolTipText("Edit selection in new tab");
566	535	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	536	+
	537	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
569	538	closeButton.setToolTipText("Close tab");
570	539	closeButton.addActionListener(this);
571	540	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	541	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574	542
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	543	+ cGridBag commandsPanel = new cGridBag();
	544	+
	545	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+ editButton.setToolTipText("Edit selection");
577	547	editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	548
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	549	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	550	+ uneditButton.setToolTipText("Unedit selection");
583	551	uneditButton.addActionListener(this);
584	552
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	553	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	554	+ allParamsButton.setToolTipText("Edit all params");
597	555	allParamsButton.addActionListener(this);
598	556
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	557	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	558	+ clearPanelButton.setToolTipText("Clear edit panel");
	559	+ clearPanelButton.addActionListener(this);
	560	+
	561	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	562	+ unselectButton.setToolTipText("Unselect");
604	563	unselectButton.addActionListener(this);
605	564
	565	+ commandsPanel.preferredHeight = 1;
	566	+
	567	+ oe.treePanel.add(commandsPanel);
	568	+ oe.treePanel.Return();
	569	+
606	570	// oe.aConstraints.gridx += 1;
607	571	// oe.aConstraints.weighty = 0;
608	572	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +578,37 @@
614	578	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	579	// gcButton.addActionListener(this);
616	580
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	581	+ cGridBag jSPPanel = new cGridBag();
	582	+
	583	+ JScrollPane jSP;
628	584	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	585	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
630	586	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	587	+
	588	+ oe.treePanel.add(jSPPanel);
	589	+ oe.treePanel.Return();
635	590
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	591	+ cGridBag copyOptionsPanel = new cGridBag();
	592	+
	593	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	594	+ colorCB.setToolTipText("Copy color when dropped");
640	595	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	596	+
	597	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	598	+ materialCB.setToolTipText("Copy material when dropped");
643	599	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	600	+
	601	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	602	+ textureCB.setToolTipText("Copy texture when dropped");
646	603	textureCB.addItemListener(this);
647	604
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	605	+ copyOptionsPanel.preferredHeight = 1;
	606	+ oe.treePanel.add(copyOptionsPanel);
	607	+ oe.treePanel.Return();
650	608
	609	+// mainPanel.setDividerLocation(0.5); //1.0);
	610	+// mainPanel.setResizeWeight(0.5);
	611	+
651	612	//jList.addListSelectionListener(this);
652	613	oe.jTree.addTreeSelectionListener(this);
653	614	//jTree.setRootVisible(false);
..	..	@@ -669,6 +630,78 @@
669	630	radio.layout = sevenButton;
670	631	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	632	}
	633	+
	634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	635	+ {
	636	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	637	+ boxCB.setToolTipText("Display bounding boxes");
	638	+ boxCB.addItemListener(this);
	639	+
	640	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	641	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	642	+ zoomBoxCB.addItemListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	647	+ supportCB.setToolTipText("Enable rigging");
	648	+ supportCB.addItemListener(this);
	649	+
	650	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	651	+ // localCB.addItemListener(this);
	652	+
	653	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	654	+ crowdCB.setToolTipText("Used for crowds");
	655	+ crowdCB.addItemListener(this);
	656	+
	657	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	658	+ smoothCB.setToolTipText("Snapping delay");
	659	+ smoothCB.addItemListener(this);
	660	+
	661	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	662	+ slowCB.setToolTipText("Smooth interpolation");
	663	+ slowCB.addItemListener(this);
	664	+
	665	+// constraints.gridy += 1;
	666	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	667	+// speakerMocapCB.addItemListener(this);
	668	+
	669	+ if (false)
	670	+ {
	671	+ // handled in scripts
	672	+ //constraints.gridy += 1;
	673	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	674	+ speakerCameraCB.addItemListener(this);
	675	+
	676	+ //constraints.gridy += 1;
	677	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	678	+ speakerFocusCB.addItemListener(this);
	679	+
	680	+ //constraints.gridy += 1;
	681	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	682	+ smoothfocusCB.addItemListener(this);
	683	+ }
	684	+
	685	+//constraints.gridx += 1;
	686	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	687	+// debugCB.addItemListener(this);
	688	+
	689	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	690	+ oeilCB.addItemListener(this);
	691	+
	692	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	693	+ lookAtCB.setToolTipText("Look-at target");
	694	+ lookAtCB.addItemListener(this);
	695	+
	696	+ }
	697	+
	698	+ cGridBag fill = new cGridBag();
	699	+
	700	+ fill.preferredHeight = 200;
	701	+
	702	+ panel.add(fill);
	703	+
	704	+ }
672	705
673	706	void EditObject(Object3D obj)
674	707	{
..	..	@@ -951,11 +984,11 @@
951	984	{
952	985	loadClipboard(true);
953	986	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
	987	+ pasteInto(false, false);
955	988	} else {
956	989	loadClipboard(false);
957	990	objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
	991	+ pasteInto(false, false); // true); // ???
959	992	}
960	993	}
961	994	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1077,27 +1110,33 @@
1077	1110	kleinItem.addActionListener(this);
1078	1111	particleItem = menu.add(new MenuItem("Particle system"));
1079	1112	particleItem.addActionListener(this);
	1113	+ if (Globals.ADVANCED)
	1114	+ {
1080	1115	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1116	ragdollItem.addActionListener(this);
1082	1117	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1118	ragdoll2Item.addActionListener(this);
	1119	+ }
1084	1120	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1121	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1122	meshItem.addActionListener(this);
1087	1123	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1124	// meshGroupItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1089	1127	springItem = menu.add(new MenuItem("Spring"));
1090	1128	springItem.addActionListener(this);
1091	1129	flagItem = menu.add(new MenuItem("Flag"));
1092	1130	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1131	blobItem = menu.add(new MenuItem("Blob"));
1098	1132	blobItem.addActionListener(this);
1099	1133	latheItem = menu.add(new MenuItem("Lathe"));
1100	1134	latheItem.addActionListener(this);
	1135	+ }
	1136	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1137	+ bezierItem.addActionListener(this);
	1138	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1139	+ overlayItem.addActionListener(this);
1101	1140	lightItem = menu.add(new MenuItem("Light"));
1102	1141	lightItem.addActionListener(this);
1103	1142	menu.add("-");
..	..	@@ -1107,25 +1146,26 @@
1107	1146	loopItem.addActionListener(this);
1108	1147	doubleItem = menu.add(new MenuItem("Fork"));
1109	1148	doubleItem.addActionListener(this);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
1110	1151	tripleItem = menu.add(new MenuItem("Trident"));
1111	1152	tripleItem.addActionListener(this);
	1153	+ }
1112	1154	}
1113	1155
1114	1156	void buildToolsMenu(Menu menu)
1115	1157	{
1116	1158	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1159	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1160	+ animationItem.setState(Globals.ANIMATION);
1119	1161
1120	1162	menu.add("-");
1121	1163	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1164	parseverticesItem.addActionListener(this);
1123	1165	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1166	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1167	+ alignItem = menu.add(new MenuItem("Align Object"));
1126	1168	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1169	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1170	reduceMorphItem.addActionListener(this);
1131	1171	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..	..	@@ -1133,8 +1173,12 @@
1133	1173
1134	1174	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1175	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1180	+ mirrorItem.addActionListener(this);
	1181	+ menu.add("-");
1138	1182	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1183	memoryItem.addActionListener(this);
1140	1184	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1157,6 +1201,7 @@
1157	1201	menu.add("-");
1158	1202	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1203	editScriptItem.addActionListener(this);
	1204	+ }
1160	1205	}
1161	1206
1162	1207	void ScreenFit()
..	..	@@ -1510,6 +1555,7 @@
1510	1555	//
1511	1556	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1557	{
	1558	+ Object source = event.getSource();
1513	1559	/*
1514	1560	if (event.getSource() == nameField)
1515	1561	{
..	..	@@ -1521,11 +1567,11 @@
1521	1567	}
1522	1568	else
1523	1569	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1570	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1571	{
1526	1572	ScreenFit();
1527	1573	} else
1528		- if (event.getSource() == switchItem)
	1574	+ if (source == switchItem)
1529	1575	{
1530	1576	cVector v1 = new cVector();
1531	1577	cVector v2 = new cVector();
..	..	@@ -1534,11 +1580,11 @@
1534	1580	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1581	objEditor.cameraView.repaint();
1536	1582	} else
1537		- if (event.getSource() == rectoidItem)
	1583	+ if (source == rectoidItem)
1538	1584	{
1539	1585	makeSomething(new Box());
1540	1586	} else
1541		- if (event.getSource() == particleItem)
	1587	+ if (source == particleItem)
1542	1588	{
1543	1589	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1590	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1605,9 @@
1559	1605	applyExample(particleGeom, "SMOKE");
1560	1606	makeSomething(particleGeom);
1561	1607	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1608	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1609	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1610	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1611
1566	1612	ragdoll.toParent = LA.newMatrix();
1567	1613	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1625,7 @@
1579	1625	} else
1580	1626	/*
1581	1627	*/
1582		- if (event.getSource() == heightFieldItem)
	1628	+ if (source == heightFieldItem)
1583	1629	{
1584	1630	Object3D obj = new Object3D();
1585	1631
..	..	@@ -1617,31 +1663,31 @@
1617	1663
1618	1664	makeSomething(obj);
1619	1665	} else
1620		- if (event.getSource() == gridItem)
	1666	+ if (source == gridItem)
1621	1667	{
1622	1668	makeSomething(new Grid());
1623	1669	} else
1624		- if (event.getSource() == ellipsoidItem)
	1670	+ if (source == ellipsoidItem)
1625	1671	{
1626	1672	makeSomething(new Sphere());
1627	1673	} else
1628		- if (event.getSource() == coneItem)
	1674	+ if (source == coneItem)
1629	1675	{
1630	1676	makeSomething(new Cone());
1631	1677	} else
1632		- if (event.getSource() == torusItem)
	1678	+ if (source == torusItem)
1633	1679	{
1634	1680	makeSomething(new Torus());
1635	1681	} else
1636		- if (event.getSource() == superItem)
	1682	+ if (source == superItem)
1637	1683	{
1638	1684	makeSomething(new Superellipsoid());
1639	1685	} else
1640		- if (event.getSource() == kleinItem)
	1686	+ if (source == kleinItem)
1641	1687	{
1642	1688	makeSomething(new Klein());
1643	1689	} else
1644		- if (event.getSource() == blobItem)
	1690	+ if (source == blobItem)
1645	1691	{
1646	1692	Blob blob = new Blob();
1647	1693	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1695,15 @@
1649	1695	//blob.retile();
1650	1696	makeSomething(blob);
1651	1697	} else
1652		- if (event.getSource() == latheItem)
	1698	+ if (source == latheItem)
1653	1699	{
1654	1700	makeSomething(new Lathe());
1655	1701	} else
1656		- if (event.getSource() == bezierItem)
	1702	+ if (source == bezierItem)
1657	1703	{
1658	1704	makeSomething(new BezierSurface());
1659	1705	} else
1660		- if (event.getSource() == checkerItem)
	1706	+ if (source == overlayItem)
1661	1707	{
1662	1708	/*
1663	1709	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1718,7 @@
1672	1718	*/
1673	1719	makeSomething(new Checker());
1674	1720	} else
1675		- if (event.getSource() == meshItem)
	1721	+ if (source == meshItem)
1676	1722	{
1677	1723	Object3D itemtomake = new Object3D();
1678	1724	Object3D child;
..	..	@@ -1693,35 +1739,35 @@
1693	1739	makeSomething(child);
1694	1740	}
1695	1741	} else
1696		- if (event.getSource() == springItem)
	1742	+ if (source == springItem)
1697	1743	{
1698	1744	cSpring s = new cSpring();
1699	1745	s.setup();
1700	1746	makeSomething(s);
1701	1747	} else
1702		- if (event.getSource() == flagItem)
	1748	+ if (source == flagItem)
1703	1749	{
1704	1750	cSpring s = new cFlag();
1705	1751	s.setup();
1706	1752	makeSomething(s);
1707	1753	} else
1708		- if (event.getSource() == lightItem)
	1754	+ if (source == lightItem)
1709	1755	{
1710	1756	makeSomething(new Light());
1711	1757	} else
1712		- if (event.getSource() == csgItem)
	1758	+ if (source == csgItem)
1713	1759	{
1714	1760	group(new CSG());
1715	1761	} else
1716		- if (event.getSource() == templateItem)
	1762	+ if (source == templateItem)
1717	1763	{
1718	1764	group(new cTemplate());
1719	1765	} else
1720		- if (event.getSource() == attributeItem)
	1766	+ if (source == attributeItem)
1721	1767	{
1722	1768	makeSomething(new Attribute());
1723	1769	} else
1724		- if (event.getSource() == pointflowItem)
	1770	+ if (source == pointflowItem)
1725	1771	{
1726	1772	makeSomething(new PointFlow());
1727	1773	} else
..	..	@@ -1733,7 +1779,7 @@
1733	1779	} else
1734	1780	*/
1735	1781
1736		- if (event.getSource() == superLoopItem)
	1782	+ if (source == superLoopItem)
1737	1783	{
1738	1784	Composite g = new cGroup();
1739	1785	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1801,7 @@
1755	1801
1756	1802	group(g);
1757	1803	} else
1758		- if (event.getSource() == loopItem)
	1804	+ if (source == loopItem)
1759	1805	{
1760	1806	Composite csg = new GroupLeaf();
1761	1807	csg.count = 5;
..	..	@@ -1764,7 +1810,7 @@
1764	1810	csg.addChild(child);
1765	1811	child.addChild(csg);
1766	1812	} else
1767		- if (event.getSource() == doubleItem)
	1813	+ if (source == doubleItem)
1768	1814	{
1769	1815	Composite csg = new GroupLeaf();
1770	1816	csg.count = 5;
..	..	@@ -1776,7 +1822,7 @@
1776	1822	csg.addChild(child);
1777	1823	child.addChild(csg);
1778	1824	} else
1779		- if (event.getSource() == tripleItem)
	1825	+ if (source == tripleItem)
1780	1826	{
1781	1827	Composite csg = new GroupLeaf();
1782	1828	csg.count = 4;
..	..	@@ -1792,70 +1838,75 @@
1792	1838	child.addChild(csg);
1793	1839	} else
1794	1840
1795		- if (event.getSource() == importGFDItem)
	1841	+ if (source == importGFDItem)
1796	1842	{
1797	1843	ImportGFD();
1798	1844	} else
1799		- if (event.getSource() == importVRMLX3DItem)
	1845	+ if (source == importVRMLX3DItem)
1800	1846	{
1801	1847	ImportVRMLX3D();
1802	1848	} else
1803		- if (event.getSource() == import3DSItem)
	1849	+ if (source == import3DSItem)
1804	1850	{
1805	1851	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806	1852	} else
1807		- if (event.getSource() == importOBJItem)
	1853	+ if (source == importOBJItem)
1808	1854	{
1809	1855	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810	1856	} else
1811		- if (event.getSource() == computeAOItem)
	1857	+ if (source == computeAOItem)
1812	1858	{
1813	1859	Globals.drawMode = CameraPane.OCCLUSION;
1814	1860	Globals.theRenderer.repaint();
1815	1861	} else
1816		- if (event.getSource() == recompileItem)
	1862	+ if (source == recompileItem)
1817	1863	{
1818	1864	Recompile();
1819	1865	refreshContents();
1820	1866	} else
1821		- if (event.getSource() == editScriptItem)
	1867	+ if (source == editScriptItem)
1822	1868	{
1823	1869	OpenDialog();
1824	1870	refreshContents();
1825	1871	} else
1826		- if (event.getSource() == invariantsItem)
	1872	+ if (source == invariantsItem)
1827	1873	{
1828	1874	System.out.println("Invariants:");
1829	1875	GrafreeD.grafreeD.universe.invariants();
1830	1876	} else
1831		- if (event.getSource() == memoryItem)
	1877	+ if (source == memoryItem)
1832	1878	{
1833	1879	//System.out.println("Invariants:");
1834	1880	PrintMemory();
1835	1881	} else
1836		- if (event.getSource() == pathItem)
	1882	+ if (source == pathItem)
1837	1883	{
1838	1884	PrintPath();
1839	1885	} else
1840		- if (event.getSource() == analyzeItem)
	1886	+ if (source == analyzeItem)
1841	1887	{
1842	1888	AnalyzeObject();
1843	1889	} else
1844		- if (event.getSource() == dumpItem)
	1890	+ if (source == dumpItem)
1845	1891	{
1846	1892	DumpObject();
1847	1893	} else
1848		- if (event.getSource() == screenfitButton)
	1894	+ if (source == oneStepButton)
	1895	+ {
	1896	+ Globals.ONESTEP = true;
	1897	+ cameraView.repaint();
	1898	+ } else
	1899	+ if (source == screenfitButton)
1849	1900	{
1850	1901	//Reload(lastConverter, lastFilename, true);
1851	1902	ScreenFit();
1852	1903	} else
1853		- if (event.getSource() == screenfitpointButton)
	1904	+ if (source == screenfitpointButton)
1854	1905	{
1855	1906	//Reload(lastConverter, lastFilename, true);
1856	1907	ScreenFitPoint();
1857	1908	} else
1858		- if (event.getSource() == snapobjectButton)
	1909	+ if (source == snapobjectButton)
1859	1910	{
1860	1911	//Reload(lastConverter, lastFilename, true);
1861	1912	SnapObject();
..	..	@@ -1866,13 +1917,13 @@
1866	1917	// Recompile();
1867	1918	// refreshContents();
1868	1919	// } else
1869		- if (event.getSource() == gcButton)
	1920	+ if (source == gcButton)
1870	1921	{
1871	1922	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	1923	System.gc();
1873	1924	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	1925	} else
1875		- if (event.getSource() == editLeafItem)
	1926	+ if (source == editLeafItem)
1876	1927	{
1877	1928	Object3D obj;
1878	1929	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +1937,66 @@
1886	1937	}
1887	1938	refreshContents(true);
1888	1939	} else
1889		- if (event.getSource() == openWindowItem)
	1940	+ if (source == openWindowItem)
1890	1941	{
1891	1942	EditSelection(true);
1892	1943	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1944	+ if (source == cutItem \|\| source == clearButton)
1894	1945	{
1895	1946	loadClipboard(true);
1896	1947	} else
1897		- if (event.getSource() == duplicateItem)
	1948	+ if (source == duplicateItem)
1898	1949	{
1899	1950	Object3D keep = GrafreeD.clipboard;
1900	1951	loadClipboard(false);
1901	1952	paste(false);
1902	1953	GrafreeD.clipboard = keep;
1903	1954	} else
1904		- if (event.getSource() == cloneItem)
	1955	+ if (source == cloneItem)
1905	1956	{
1906	1957	CloneSelection(false);
1907	1958	} else
1908		- if (event.getSource() == cloneSupportItem)
	1959	+ if (source == cloneSupportItem)
1909	1960	{
1910	1961	CloneSelection(true);
1911	1962	} else
1912		- if (event.getSource() == copyItem)
	1963	+ if (source == copyItem)
1913	1964	{
1914	1965	loadClipboard(false);
1915	1966	} else
1916		- if (event.getSource() == pasteItem)
	1967	+ if (source == pasteItem)
1917	1968	{
1918	1969	paste(false);
1919	1970	} else
1920		- if (event.getSource() == pasteLinkItem)
	1971	+ if (source == pasteIntoItem)
1921	1972	{
1922		- pasteInto(false);
	1973	+ pasteInto(true, false);
1923	1974	} else
1924		- if (event.getSource() == pasteCloneItem)
	1975	+ if (source == pasteLinkItem)
1925	1976	{
1926		- pasteInto(true);
	1977	+ pasteInto(false, false);
1927	1978	} else
1928		- if (event.getSource() == pasteExpandItem)
	1979	+ if (source == pasteCloneItem)
	1980	+ {
	1981	+ pasteInto(true, true);
	1982	+ } else
	1983	+ if (source == pasteExpandItem)
1929	1984	{
1930	1985	paste(true);
1931	1986	} else
1932		- if (event.getSource() == synchronizeItem)
	1987	+ if (source == synchronizeItem)
1933	1988	{
1934	1989	Overwrite(Object3D.TRANSFORM);
1935	1990	} else
1936		- if (event.getSource() == overwriteNameItem)
	1991	+ if (source == overwriteNameItem)
1937	1992	{
1938	1993	Overwrite(Object3D.NAME);
1939	1994	} else
1940		- if (event.getSource() == overwriteUVItem)
	1995	+ if (source == overwriteUVItem)
1941	1996	{
1942	1997	Overwrite(Object3D.UV);
1943	1998	} else
1944		- if (event.getSource() == overwriteMatItem)
	1999	+ if (source == overwriteMatItem)
1945	2000	{
1946	2001	/* july 2015
1947	2002	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2016,7 @@
1961	2016
1962	2017	Overwrite(dropAttributes);
1963	2018	}
1964		- if (event.getSource() == overwriteGeoItem)
	2019	+ if (source == overwriteGeoItem)
1965	2020	{
1966	2021	Overwrite(Object3D.GEOMETRY);
1967	2022	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2033,7 @@
1978	2033	// refreshContents();
1979	2034	// }
1980	2035	} else
1981		- if (event.getSource() == generateMeshItem)
	2036	+ if (source == generateMeshItem)
1982	2037	{
1983	2038	//if (group.selection.size() == 1)
1984	2039	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2044,7 @@
1989	2044	ResetModel();
1990	2045	refreshContents();
1991	2046	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2047	+ if (source == extractGeometriesItem)
1993	2048	{
1994	2049	boolean one = false;
1995	2050
..	..	@@ -2016,7 +2071,7 @@
2016	2071	ResetModel();
2017	2072	refreshContents();
2018	2073	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2074	+ if (source == cloneGeometriesItem)
2020	2075	{
2021	2076	boolean one = false;
2022	2077
..	..	@@ -2042,7 +2097,7 @@
2042	2097	ResetModel();
2043	2098	refreshContents();
2044	2099	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2100	+ if (source == shareGeometriesItem)
2046	2101	{
2047	2102	boolean one = false;
2048	2103
..	..	@@ -2072,7 +2127,7 @@
2072	2127	refreshContents();
2073	2128	}
2074	2129	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2130	+ if (source == mergeGeometriesItem)
2076	2131	{
2077	2132	boolean one = false;
2078	2133
..	..	@@ -2102,7 +2157,7 @@
2102	2157	ResetModel();
2103	2158	refreshContents();
2104	2159	} else
2105		- if (event.getSource() == linkverticesItem)
	2160	+ if (source == linkverticesItem)
2106	2161	{
2107	2162	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2163	// {
..	..	@@ -2125,38 +2180,38 @@
2125	2180	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2181	for (int i=0; i<group.selection.size(); i++)
2127	2182	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2183	+ boolean random = CameraPane.SWITCH;
	2184	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2185	group.selection.get(i).linkVerticesThis(content);
2131	2186	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2187	+ CameraPane.SWITCH = random;
2133	2188	}
2134	2189	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2190	refreshContents();
2136	2191	}
2137	2192	} else
2138		- if (event.getSource() == resetsupportItem)
	2193	+ if (source == resetsupportItem)
2139	2194	{
2140	2195	for (int i=0; i<group.selection.size(); i++)
2141	2196	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2197	+ boolean random = CameraPane.SWITCH;
	2198	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2199	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2200	+ CameraPane.SWITCH = random;
2146	2201	}
2147	2202
2148	2203	refreshContents();
2149	2204	} else
2150		- if (event.getSource() == relinkverticesItem)
	2205	+ if (source == relinkverticesItem)
2151	2206	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2207	+ boolean random = CameraPane.SWITCH;
	2208	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2209	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2210	+ CameraPane.SWITCH = random;
2156	2211
2157	2212	refreshContents();
2158	2213	} else
2159		- if (event.getSource() == resetreferencesItem)
	2214	+ if (source == resetreferencesItem)
2160	2215	{
2161	2216	for (int i=0; i<group.selection.size(); i++)
2162	2217	{
..	..	@@ -2165,7 +2220,7 @@
2165	2220
2166	2221	refreshContents();
2167	2222	} else
2168		- if (event.getSource() == setMasterItem)
	2223	+ if (source == setMasterItem)
2169	2224	{
2170	2225	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2171	2226	{
..	..	@@ -2178,7 +2233,7 @@
2178	2233	refreshContents();
2179	2234	}
2180	2235	} else
2181		- if (event.getSource() == poseMeshItem)
	2236	+ if (source == poseMeshItem)
2182	2237	{
2183	2238	if (group.selection.size() == 1)
2184	2239	{
..	..	@@ -2197,19 +2252,19 @@
2197	2252	}
2198	2253
2199	2254	} else
2200		- if (event.getSource() == revertMeshItem)
	2255	+ if (source == revertMeshItem)
2201	2256	{
2202	2257	RevertMeshes();
2203	2258	} else
2204		- if (event.getSource() == resetMeshItem)
	2259	+ if (source == resetMeshItem)
2205	2260	{
2206	2261	ResetAll();
2207	2262	} else
2208		- if (event.getSource() == stepAllItem)
	2263	+ if (source == stepAllItem)
2209	2264	{
2210	2265	StepAll();
2211	2266	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2267	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2268	{
2214	2269	//int indices[] = jList.getSelectedIndices();
2215	2270	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2272,46 @@
2217	2272
2218	2273	ClearSelection(false);
2219	2274	} else
2220		- if (event.getSource() == clearAllItem)
	2275	+ if (source == clearAllItem)
2221	2276	{
2222	2277	ClearSelection(true);
2223	2278	} else
2224		- if (event.getSource() == grabItem)
	2279	+ if (source == grabItem)
2225	2280	{
2226	2281	group(new cGroup(), true);
2227	2282	} else
2228		- if (event.getSource() == hideItem)
	2283	+ if (source == hideItem)
2229	2284	{
2230	2285	group(new HiddenObject());
2231	2286	} else
2232		- if (event.getSource() == frontItem)
	2287	+ if (source == frontItem)
2233	2288	{
2234	2289	front();
2235	2290	} else
2236		- if (event.getSource() == backItem)
	2291	+ if (source == backItem)
2237	2292	{
2238	2293	back();
2239	2294	} else
2240		- if (event.getSource() == cameraItem)
	2295	+ if (source == cameraItem)
2241	2296	{
2242	2297	makeSomething(new Camera());
2243	2298	} else
2244		- if (event.getSource() == compositeItem)
	2299	+ if (source == compositeItem)
2245	2300	{
2246	2301	group(new Composite());
2247	2302	} else
2248		- if (event.getSource() == randomItem)
	2303	+ if (source == randomItem)
2249	2304	{
2250	2305	RandomNode random = new RandomNode();
2251	2306	group(random);
2252	2307	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2308	+ random.name = random.get(0).name + "Switch";
2254	2309	} else
2255		- if (event.getSource() == physicsItem)
	2310	+ if (source == physicsItem)
2256	2311	{
2257	2312	group(new PhysicsNode());
2258	2313	} else
2259		- if (event.getSource() == frameselectorItem)
	2314	+ if (source == frameselectorItem)
2260	2315	{
2261	2316	for (int i=0; i<group.selection.size(); i++)
2262	2317	{
..	..	@@ -2268,7 +2323,7 @@
2268	2323	ResetModel();
2269	2324	refreshContents();
2270	2325	} else
2271		- if (event.getSource() == switchGeoItem)
	2326	+ if (source == switchGeoItem)
2272	2327	{
2273	2328	for (int i=0; i<group.selection.size(); i++)
2274	2329	{
..	..	@@ -2280,7 +2335,7 @@
2280	2335	ResetModel();
2281	2336	refreshContents();
2282	2337	} else
2283		- if (event.getSource() == switchTransfoItem)
	2338	+ if (source == switchTransfoItem)
2284	2339	{
2285	2340	for (int i=0; i<group.selection.size(); i++)
2286	2341	{
..	..	@@ -2292,7 +2347,7 @@
2292	2347	ResetModel();
2293	2348	refreshContents();
2294	2349	} else
2295		- if (event.getSource() == morphItem)
	2350	+ if (source == morphItem)
2296	2351	{
2297	2352	for (int i=0; i<group.selection.size(); i++)
2298	2353	{
..	..	@@ -2304,7 +2359,7 @@
2304	2359	ResetModel();
2305	2360	refreshContents();
2306	2361	} else
2307		- if (event.getSource() == scriptNodeItem)
	2362	+ if (source == scriptNodeItem)
2308	2363	{
2309	2364	boolean atleastone = false;
2310	2365
..	..	@@ -2343,31 +2398,31 @@
2343	2398	}
2344	2399	}
2345	2400	} else
2346		- if (event.getSource() == linkerItem)
	2401	+ if (source == linkerItem)
2347	2402	{
2348	2403	group(new cLinker());
2349	2404	} else
2350		- if (event.getSource() == textureItem)
	2405	+ if (source == textureItem)
2351	2406	{
2352	2407	group(new TextureNode());
2353	2408	} else
2354		- if (event.getSource() == billboardItem)
	2409	+ if (source == billboardItem)
2355	2410	{
2356	2411	group(new BillboardNode());
2357	2412	} else
2358		- if (event.getSource() == shadowXItem)
	2413	+ if (source == shadowXItem)
2359	2414	{
2360	2415	CastShadow(0);
2361	2416	} else
2362		- if (event.getSource() == shadowYItem)
	2417	+ if (source == shadowYItem)
2363	2418	{
2364	2419	CastShadow(1);
2365	2420	} else
2366		- if (event.getSource() == shadowZItem)
	2421	+ if (source == shadowZItem)
2367	2422	{
2368	2423	CastShadow(2);
2369	2424	} else
2370		- if (event.getSource() == ungroupItem)
	2425	+ if (source == ungroupItem)
2371	2426	{
2372	2427	//ungroup();
2373	2428	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2434,179 @@
2379	2434
2380	2435	refreshContents();
2381	2436	} else
2382		- if (event.getSource() == genUVItem)
	2437	+ if (source == genUVItem)
2383	2438	{
2384	2439	GenUV();
2385	2440	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2441	+ if (source == genNormalsCADItem)
2387	2442	{
2388	2443	GenNormals(true);
2389	2444	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2445	+ if (source == genNormalsMESHItem)
2391	2446	{
2392	2447	GenNormals(true); // TODO
2393	2448	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2449	+ if (source == genNormalsORGANItem)
2395	2450	{
2396	2451	GenNormals(false);
2397	2452	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2453	+ if (source == genNormalsMINEItem)
2399	2454	{
2400	2455	GenNormalsMINE();
2401	2456	} else
2402		- if (event.getSource() == stripifyItem)
	2457	+ if (source == stripifyItem)
2403	2458	{
2404	2459	Stripify();
2405	2460	} else
2406		- if (event.getSource() == unstripifyItem)
	2461	+ if (source == unstripifyItem)
2407	2462	{
2408	2463	Unstripify();
2409	2464	} else
2410		- if (event.getSource() == trimItem)
	2465	+ if (source == trimItem)
2411	2466	{
2412	2467	Trim();
2413	2468	} else
2414		- if (event.getSource() == untrimItem)
	2469	+ if (source == untrimItem)
2415	2470	{
2416	2471	Untrim();
2417	2472	} else
2418		- if (event.getSource() == clearColorsItem)
	2473	+ if (source == clearColorsItem)
2419	2474	{
2420	2475	ClearColors();
2421	2476	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2477	+ if (source == clearMaterialsItem)
2423	2478	{
2424	2479	ClearMaterials();
2425	2480	} else
2426		- if (event.getSource() == liveleavesItem)
	2481	+ if (source == liveleavesItem)
2427	2482	{
2428	2483	LiveLeaves(true);
2429	2484	} else
2430		- if (event.getSource() == unliveleavesItem)
	2485	+ if (source == unliveleavesItem)
2431	2486	{
2432	2487	LiveLeaves(false);
2433	2488	} else
2434		- if (event.getSource() == supportleavesItem)
	2489	+ if (source == supportleavesItem)
2435	2490	{
2436	2491	SupportLeaves(true);
2437	2492	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2493	+ if (source == unsupportleavesItem)
2439	2494	{
2440	2495	SupportLeaves(false);
2441	2496	} else
2442		- if (event.getSource() == hideleavesItem)
	2497	+ if (source == hideleavesItem)
2443	2498	{
2444	2499	HideLeaves(true);
2445	2500	} else
2446		- if (event.getSource() == showleavesItem)
	2501	+ if (source == showleavesItem)
2447	2502	{
2448	2503	HideLeaves(false);
2449	2504	} else
2450		- if (event.getSource() == markleavesItem)
	2505	+ if (source == markleavesItem)
2451	2506	{
2452	2507	MarkLeaves(true);
2453	2508	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2509	+ if (source == unmarkleavesItem)
2455	2510	{
2456	2511	MarkLeaves(false);
2457	2512	} else
2458		- if (event.getSource() == flipVItem)
	2513	+ if (source == flipVItem)
2459	2514	{
2460	2515	FlipV(true);
2461	2516	} else
2462		- if (event.getSource() == unflipVItem)
	2517	+ if (source == unflipVItem)
2463	2518	{
2464	2519	FlipV(false);
2465	2520	} else
2466		- if (event.getSource() == lowTexturesItem)
	2521	+ if (source == lowTexturesItem)
2467	2522	{
2468	2523	SetTexRes(0);
2469	2524	} else
2470		- if (event.getSource() == normalTexturesItem)
	2525	+ if (source == normalTexturesItem)
2471	2526	{
2472	2527	SetTexRes(1);
2473	2528	} else
2474		- if (event.getSource() == highTexturesItem)
	2529	+ if (source == highTexturesItem)
2475	2530	{
2476	2531	SetTexRes(2);
2477	2532	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2533	+ if (source == veryhighTexturesItem)
2479	2534	{
2480	2535	SetTexRes(3);
2481	2536	} else
2482		- if (event.getSource() == maxTexturesItem)
	2537	+ if (source == maxTexturesItem)
2483	2538	{
2484	2539	SetTexRes(4);
2485	2540	} else
2486		- if (event.getSource() == panoTexturesItem)
	2541	+ if (source == panoTexturesItem)
2487	2542	{
2488	2543	SetTexRes(5);
2489	2544	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2545	+ if (source == reverseNormalsItem)
2491	2546	{
2492	2547	ReverseNormals();
2493	2548	} else
2494		- if (event.getSource() == parseverticesItem)
	2549	+ if (source == parseverticesItem)
2495	2550	{
2496	2551	ParseVertices();
2497	2552	} else
2498		- if (event.getSource() == textureFieldItem)
	2553	+ if (source == textureFieldItem)
2499	2554	{
2500	2555	TextureVertices();
2501	2556	} else
2502		- if (event.getSource() == alignItem)
	2557	+ if (source == alignItem)
2503	2558	{
2504	2559	Align();
2505	2560	} else
2506		- if (event.getSource() == mirrorItem)
	2561	+ if (source == mirrorItem)
2507	2562	{
2508	2563	MirrorPoses();
2509	2564	} else
2510		- if (event.getSource() == reduceMorphItem)
	2565	+ if (source == reduceMorphItem)
2511	2566	{
2512	2567	MeshReduction(false);
2513	2568	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2569	+ if (source == reduce34MorphItem)
2515	2570	{
2516	2571	MeshReduction(true);
2517	2572	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2573	+ if (source == reverseTrianglesItem)
2519	2574	{
2520	2575	ReverseTriangles();
2521	2576	} else
2522		- if (event.getSource() == reduceMeshItem)
	2577	+ if (source == reduceMeshItem)
2523	2578	{
2524	2579	ReduceMesh(false);
2525	2580	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2581	+ if (source == reduce34MeshItem)
2527	2582	{
2528	2583	ReduceMesh(true);
2529	2584	} else
2530		- if (event.getSource() == increaseMeshItem)
	2585	+ if (source == increaseMeshItem)
2531	2586	{
2532	2587	IncreaseMesh();
2533	2588	} else
2534		- if (event.getSource() == clipMeshItem)
	2589	+ if (source == clipMeshItem)
2535	2590	{
2536	2591	ClipMesh();
2537	2592	} else
2538		- if (event.getSource() == smoothMeshItem)
	2593	+ if (source == smoothMeshItem)
2539	2594	{
2540	2595	SmoothMesh();
2541	2596	} else
2542		- if (event.getSource() == transformgeometryItem)
	2597	+ if (source == transformgeometryItem)
2543	2598	{
2544	2599	TransformGeometry();
2545	2600	} else
2546		- if (event.getSource() == resetTransformItem)
	2601	+ if (source == resetTransformItem)
2547	2602	{
2548	2603	ResetTransform();
2549	2604	} else
2550		- if (event.getSource() == resetCentroidItem)
	2605	+ if (source == resetCentroidItem)
2551	2606	{
2552	2607	ResetCentroid();
2553	2608	} else
2554		- if (event.getSource() == resetParentItem)
	2609	+ if (source == resetParentItem)
2555	2610	{
2556	2611	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2612	{
..	..	@@ -2561,7 +2616,7 @@
2561	2616
2562	2617	refreshContents();
2563	2618	} else
2564		- if (event.getSource() == repairParentItem)
	2619	+ if (source == repairParentItem)
2565	2620	{
2566	2621	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2622	{
..	..	@@ -2575,7 +2630,7 @@
2575	2630
2576	2631	refreshContents();
2577	2632	} else
2578		- if (event.getSource() == repairShadowItem)
	2633	+ if (source == repairShadowItem)
2579	2634	{
2580	2635	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2636	{
..	..	@@ -2589,7 +2644,7 @@
2589	2644
2590	2645	refreshContents();
2591	2646	} else
2592		- if (event.getSource() == sortbysizeItem)
	2647	+ if (source == sortbysizeItem)
2593	2648	{
2594	2649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2650	{
..	..	@@ -2601,7 +2656,7 @@
2601	2656	ResetModel();
2602	2657	refreshContents();
2603	2658	} else
2604		- if (event.getSource() == sortbynameItem)
	2659	+ if (source == sortbynameItem)
2605	2660	{
2606	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2662	{
..	..	@@ -2613,7 +2668,7 @@
2613	2668	ResetModel();
2614	2669	refreshContents();
2615	2670	} else
2616		- if (event.getSource() == attachPigmentItem)
	2671	+ if (source == attachPigmentItem)
2617	2672	{
2618	2673	String texture = GetFile("Attach pigment");
2619	2674	Object3D obj;
..	..	@@ -2625,7 +2680,7 @@
2625	2680
2626	2681	refreshContents();
2627	2682	} else
2628		- if (event.getSource() == detachPigmentItem)
	2683	+ if (source == detachPigmentItem)
2629	2684	{
2630	2685	Object3D obj;
2631	2686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2691,7 @@
2636	2691
2637	2692	refreshContents();
2638	2693	} else
2639		- if (event.getSource() == attachBumpItem)
	2694	+ if (source == attachBumpItem)
2640	2695	{
2641	2696	String texture = GetFile("Attach bump");
2642	2697	Object3D obj;
..	..	@@ -2648,7 +2703,7 @@
2648	2703
2649	2704	refreshContents();
2650	2705	} else
2651		- if (event.getSource() == detachBumpItem)
	2706	+ if (source == detachBumpItem)
2652	2707	{
2653	2708	Object3D obj;
2654	2709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2714,7 @@
2659	2714
2660	2715	refreshContents();
2661	2716	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2717	+ if (source == pigmentBumpItem)
2663	2718	{
2664	2719	Object3D obj;
2665	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2725,195 @@
2670	2725
2671	2726	refreshContents();
2672	2727	} else
2673		- if (event.getSource() == flashSelectionButton)
	2728	+ if (source == flashSelectionButton)
2674	2729	{
2675	2730	CameraPane.flash = true;
2676	2731	refreshContents();
2677	2732	} else
2678		- if (event.getSource() == oneButton)
	2733	+ if (source == oneButton)
2679	2734	{
2680	2735	} else
2681		- if (event.getSource() == twoButton)
	2736	+ if (source == twoButton)
2682	2737	{
2683	2738	radio.layout = twoButton;
2684	2739	// bug
2685	2740	//gridPanel.setDividerLocation(1.0);
2686	2741	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2750	+// aWindowConstraints.weightx = 0;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// //bigThree.add(jtp, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// bigThree.add(centralPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// scenePanel.setVisible(false);
	2766	+// centralPanel.setVisible(true);
	2767	+// XYZPanel.setVisible(false);
	2768	+ bigThree.ClearUI();
	2769	+ bigThree.add(centralPanel);
	2770	+ bigThree.FlushUI();
2711	2771	} else
2712		- if (event.getSource() == threeButton)
	2772	+ if (source == threeButton)
2713	2773	{
2714	2774	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2775	+
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// bigThree.validate();
	2800	+// scenePanel.setVisible(false);
	2801	+// centralPanel.setVisible(true);
	2802	+// XYZPanel.setVisible(true);
	2803	+ bigThree.ClearUI();
	2804	+ bigThree.add(centralPanel);
	2805	+ bigThree.add(XYZPanel);
	2806	+ bigThree.FlushUI();
2739	2807	} else
2740		- if (event.getSource() == fourButton)
	2808	+ if (source == fourButton)
2741	2809	{
2742	2810	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- bigThree.revalidate();
	2811	+
	2812	+// bigThree.remove(scenePanel);
	2813	+// bigThree.remove(centralPanel);
	2814	+// bigThree.remove(XYZPanel);
	2815	+// aWindowConstraints.gridx = 0;
	2816	+// aWindowConstraints.gridy = 0;
	2817	+// aWindowConstraints.gridwidth = 1;
	2818	+// // aWindowConstraints.gridheight = 3;
	2819	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.weighty = 1;
	2822	+// bigThree.add(scenePanel, aWindowConstraints);
	2823	+// aWindowConstraints.weightx = 1;
	2824	+// aWindowConstraints.gridwidth = 3;
	2825	+// // aConstraints.gridheight = 3;
	2826	+// aWindowConstraints.gridx = 1;
	2827	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2828	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2829	+// aWindowConstraints.weightx = 0;
	2830	+// aWindowConstraints.gridx = 4;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2835	+// bigThree.validate();
	2836	+// scenePanel.setVisible(true);
	2837	+// centralPanel.setVisible(false);
	2838	+// XYZPanel.setVisible(false);
	2839	+ bigThree.ClearUI();
	2840	+ bigThree.add(scenePanel);
	2841	+ bigThree.FlushUI();
2767	2842	} else
2768		- if (event.getSource() == sixButton)
	2843	+ if (source == sixButton)
2769	2844	{
2770	2845	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	2846	+
	2847	+// bigThree.remove(scenePanel);
	2848	+// bigThree.remove(centralPanel);
	2849	+// bigThree.remove(XYZPanel);
	2850	+// aWindowConstraints.gridx = 0;
	2851	+// aWindowConstraints.gridy = 0;
	2852	+// aWindowConstraints.gridwidth = 1;
	2853	+// // aConstraints.gridheight = 3;
	2854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.weighty = 1;
	2857	+// bigThree.add(scenePanel, aWindowConstraints);
	2858	+// aWindowConstraints.weightx = 1;
	2859	+// aWindowConstraints.gridwidth = 3;
	2860	+// // aWindowConstraints.gridheight = 3;
	2861	+// aWindowConstraints.gridx = 1;
	2862	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2863	+// bigThree.add(centralPanel, aWindowConstraints);
	2864	+// aWindowConstraints.weightx = 0;
	2865	+// aWindowConstraints.gridx = 4;
	2866	+// aWindowConstraints.gridwidth = 1;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2869	+// //bigThree.add(XYZPanel, aConstraints);
	2870	+// bigThree.validate();
	2871	+// scenePanel.setVisible(true);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(scenePanel);
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2795	2878	} else
2796		- if (event.getSource() == sevenButton)
	2879	+ if (source == sevenButton)
2797	2880	{
2798	2881	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aWindowConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// bigThree.add(scenePanel, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(true);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(scenePanel);
	2912	+ bigThree.add(centralPanel);
	2913	+ bigThree.add(XYZPanel);
	2914	+ bigThree.FlushUI();
2823	2915	} else
2824		- if (event.getSource() == rootButton)
	2916	+ if (source == rootButton)
2825	2917	{
2826	2918	Object3D obj;
2827	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2833,7 +2925,7 @@
2833	2925
2834	2926	refreshContents(true);
2835	2927	} else
2836		- if (event.getSource() == closeButton)
	2928	+ if (source == closeButton)
2837	2929	{
2838	2930	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	2931	cRadio ab;
..	..	@@ -2854,11 +2946,11 @@
2854	2946	}
2855	2947	refreshContents(true);
2856	2948	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2949	+ if (source == editItem \|\| source == editButton)
2858	2950	{
2859	2951	EditSelection(false);
2860	2952	} else
2861		- if (event.getSource() == uneditButton)
	2953	+ if (source == uneditButton)
2862	2954	{
2863	2955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	2956	{
..	..	@@ -2870,12 +2962,12 @@
2870	2962
2871	2963	child.editWindow = null; // ???????????
2872	2964	}
2873		- objEditor.ctrlPanel.revalidate();
	2965	+ objEditor.ctrlPanel.FlushUI();
2874	2966	//objEditor.jTree.clearSelection();
2875	2967	//objEditor.ResetSliders();
2876	2968	refreshContents(true);
2877	2969	} else
2878		- if (event.getSource() == clearPanelButton)
	2970	+ if (source == clearPanelButton)
2879	2971	{
2880	2972	assert(copy == group);
2881	2973	//copy.ClearUI();
..	..	@@ -2886,7 +2978,7 @@
2886	2978	listUI.clear();
2887	2979	refreshContents(true);
2888	2980	} else
2889		- if (event.getSource() == allParamsButton)
	2981	+ if (source == allParamsButton)
2890	2982	{
2891	2983	assert(copy == group);
2892	2984
..	..	@@ -2907,19 +2999,19 @@
2907	2999
2908	3000	refreshContents(true);
2909	3001	} else
2910		- if (event.getSource() == unselectButton)
	3002	+ if (source == unselectButton)
2911	3003	{
2912	3004	objEditor.jTree.clearSelection();
2913	3005	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3006	objEditor.ResetSliders();
2915	3007	refreshContents(true);
2916	3008	} else
2917		- if(event.getSource() instanceof cRadio)
	3009	+ if(source instanceof cRadio)
2918	3010	{
2919	3011	group.parent = keepparent;
2920	3012	group.attributes = 0;
2921	3013	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3014	+ /cRadio/ radio = (cRadio)source;
2923	3015	Object3D obj = radio.GetObject();
2924	3016	System.out.println("Edit " + obj);
2925	3017	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -3589,11 +3681,11 @@
3589	3681
3590	3682	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	3683
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	3684	+ boolean random = CameraPane.SWITCH;
	3685	+ CameraPane.SWITCH = false; // parse all random nodes
3594	3686	lowres.linkVerticesThis(null);
3595	3687	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	3688	+ CameraPane.SWITCH = random;
3597	3689
3598	3690	System.err.flush();
3599	3691
..	..	@@ -4078,12 +4170,12 @@
4078	4170	System.err.println("info : " + child.GetPath());
4079	4171	}
4080	4172	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4173	+// else
	4174	+// {
	4175	+// objEditor.SetMaterial(group); // .GetMaterial());
	4176	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4177	+// System.err.println("info : " + group.GetPath());
	4178	+// }
4087	4179
4088	4180	objEditor.SetText(); // jan 2014
4089	4181
..	..	@@ -4351,7 +4443,7 @@
4351	4443	refreshContents();
4352	4444	}
4353	4445
4354		- void pasteInto(boolean copyit)
	4446	+ void pasteInto(boolean copyit, boolean clone)
4355	4447	{
4356	4448	// if (GrafreeD.clipboard == null)
4357	4449	// return;
..	..	@@ -4380,7 +4472,14 @@
4380	4472	if (copyit)
4381	4473	{
4382	4474	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4475	+ if (clone)
	4476	+ {
	4477	+ CloneClipboard(false); // sept 2014
	4478	+ }
	4479	+ else
	4480	+ {
	4481	+ paste(false);
	4482	+ }
4384	4483	}
4385	4484	else
4386	4485	{
..	..	@@ -4924,10 +5023,12 @@
4924	5023	cButton flashSelectionButton;
4925	5024	cButton editButton;
4926	5025	cButton uneditButton;
	5026	+ JCheckBox allParamsButton;
4927	5027	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5028	cButton unselectButton;
4930	5029
	5030	+ cButton oneStepButton;
	5031	+
4931	5032	cButton screenfitButton;
4932	5033	cButton screenfitpointButton;
4933	5034	cButton snapobjectButton;
..	..	@@ -4982,6 +5083,7 @@
4982	5083	private MenuItem mergeGeometriesItem;
4983	5084	private MenuItem copyItem;
4984	5085	private MenuItem pasteItem;
	5086	+ private MenuItem pasteIntoItem;
4985	5087	private MenuItem pasteLinkItem;
4986	5088	private MenuItem pasteCloneItem;
4987	5089	private MenuItem pasteExpandItem;
..	..	@@ -5079,7 +5181,7 @@
5079	5181	private MenuItem blobItem;
5080	5182	private MenuItem latheItem;
5081	5183	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5184	+ private MenuItem overlayItem;
5083	5185	private MenuItem meshItem;
5084	5186	// private MenuItem meshGroupItem;
5085	5187	private MenuItem springItem;