~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -29,7 +29,7 @@
29	29	{
30	30	cButton skyboxButton;
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34	34	skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
..	..	@@ -46,7 +46,7 @@
46	46	{
47	47	cButton textureButton;
48	48	final String path = "textures/" + f + "/" + c + "/"; // + t;
49		- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50	50	textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
..	..	@@ -347,7 +347,7 @@
347	347
348	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
349	349	{
350		- JTabbedPane skyboxpane = new JTabbedPane();
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
351	351
352	352	AddSkyboxTab0(skyboxpane);
353	353	AddSkyboxTab1(skyboxpane);
..	..	@@ -366,16 +366,6 @@
366	366	}
367	367
368	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();
379	369	}
380	370
381	371	//ObjEditor objEditor;
..	..	@@ -417,13 +407,13 @@
417	407
418	408	assert(false);
419	409
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- //Save(true);
426		- }
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
427	417
428	418	if(ui)
429	419	SetupUI(objEditor);
..	..	@@ -446,13 +436,13 @@
446	436
447	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448	438
449		- if (copy.versionlist == null)
450		- {
451		- copy.versionlist = new Object3D[100];
452		- copy.versionindex = -1;
453		-
454		- //Save(true);
455		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
456	446	}
457	447
458	448	void CloneSelection(boolean supports)
..	..	@@ -493,11 +483,16 @@
493	483
494	484	Object3D parent = obj.parent;
495	485	obj.parent = null;
	486	+
496	487	// Object3D support = obj.support;
497	488	// obj.support = null;
498	489	if (!supports)
499	490	obj.SaveSupports();
	491	+
500	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
501	496	obj.parent = parent;
502	497	// obj.support = support;
503	498	// clone.support = support; // aout 2013
..	..	@@ -567,8 +562,10 @@
567	562	pasteLinkItem.addActionListener(this);
568	563	pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
569	564	pasteCloneItem.addActionListener(this);
570		-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
571		-// pasteExpandItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
572	569	//menu.add("-");
573	570	oe.jTree.popup.addSeparator();
574	571
..	..	@@ -765,9 +762,9 @@
765	762	shadowYItem.addActionListener(this);
766	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
767	764	shadowZItem.addActionListener(this);
	765	+
768	766	attributeItem = menu.add(new MenuItem("Attribute"));
769	767	attributeItem.addActionListener(this);
770		-
771	768	if (Globals.ADVANCED)
772	769	{
773	770	menu.add("-");
..	..	@@ -779,11 +776,18 @@
779	776	pointflowItem.addActionListener(this);
780	777	}
781	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
782	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
783	787	resetTransformItem.addActionListener(this);
784	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
785	789	resetCentroidItem.addActionListener(this);
786		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
787	791	resetCentroidXZItem.addActionListener(this);
788	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
789	793	transformGeometryItem.addActionListener(this);
..	..	@@ -799,7 +803,7 @@
799	803	genNormalsCADItem.addActionListener(this);
800	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
801	805	genNormalsMESHItem.addActionListener(this);
802		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
803	807	{
804	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
805	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -835,6 +839,8 @@
835	839	}
836	840
837	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
838	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
839	845	clearMaterialsItem.addActionListener(this);
840	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -857,9 +863,9 @@
857	863	hideleavesItem.addActionListener(this);
858	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
859	865	showleavesItem.addActionListener(this);
860		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
861	867	markleavesItem.addActionListener(this);
862		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
863	869	unmarkleavesItem.addActionListener(this);
864	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
865	871	rewindleavesItem.addActionListener(this);
..	..	@@ -936,6 +942,8 @@
936	942	cGridBag currenttab;
937	943	//boolean added; // patch for jar
938	944
	945	+ int totalcount = 0;
	946	+
939	947	int tabcount = 0;
940	948	int colcount = 0;
941	949	int rowcount = 0;
..	..	@@ -958,13 +966,13 @@
958	966	currenttab.setName(tabname);
959	967	//added = false;
960	968	resourcecontainer.add(currenttab);
961		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
962	970	rowcount = 1;
963	971	colcount = 0;
964	972	texturecount = 0;
965	973	}
966	974
967		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
968	976	{
969	977	//if (!added)
970	978	{
..	..	@@ -973,7 +981,13 @@
973	981	currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974	982	}
975	983
976		- AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
977	991
978	992	if (++colcount >= columns)
979	993	{
..	..	@@ -999,6 +1013,8 @@
999	1013	container.add(resourcecontainer);
1000	1014
1001	1015	Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
1002	1018	}
1003	1019
1004	1020	void SetupUI2(ObjEditor oe)
..	..	@@ -1038,9 +1054,9 @@
1038	1054	oe.radioPanel.add(dummyButton);
1039	1055	oe.buttonGroup.add(dummyButton);
1040	1056	*/
1041		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
1042	1058
1043		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
1044	1060
1045	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1046	1062
..	..	@@ -1067,25 +1083,29 @@
1067	1083	// }
1068	1084	// });
1069	1085
1070		- oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1071	1091	collapseButton.setToolTipText("Collapse toolbar");
1072	1092	collapseButton.addActionListener(this);
1073	1093
1074		- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075		- maximize3DButton.setToolTipText("Maximize 3D view");
1076		- maximize3DButton.addActionListener(this);
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
1077	1097
1078		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1079	1099	twoButton.setToolTipText("Show 3D view only");
1080	1100	twoButton.addActionListener(this);
1081	1101	this.fullscreenLayout = twoButton;
1082	1102
1083		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1104	threeButton.setToolTipText("Show controls and 3D view");
1085	1105	threeButton.addActionListener(this);
1086	1106	if (Globals.ADVANCED)
1087	1107	{
1088		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089	1109	sixButton.setToolTipText("Show 3D view and controls");
1090	1110	sixButton.addActionListener(this);
1091	1111	}
..	..	@@ -1094,51 +1114,47 @@
1094	1114	// sevenButton.addActionListener(this);
1095	1115	//
1096	1116
1097		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1098		- fullButton.setToolTipText("Full-screen window");
1099		- fullButton.addActionListener(this);
1100		-
1101		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1102	1118	screenfitButton.setToolTipText("Screen fit");
1103	1119	screenfitButton.addActionListener(this);
1104	1120
1105		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1106	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
1107	1123	restoreCameraButton.addActionListener(this);
1108	1124
1109		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1110	1126	saveVersionButton.setToolTipText("Duplicate current version");
1111	1127	saveVersionButton.addActionListener(this);
1112	1128
1113		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1114	1130	deleteVersionButton.setToolTipText("Delete current version");
1115	1131	deleteVersionButton.addActionListener(this);
1116	1132	deleteVersionButton.setEnabled(false);
1117	1133
1118		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1119	1135	previousVersionButton.setToolTipText("Previous version");
1120	1136	previousVersionButton.addActionListener(this);
1121	1137	previousVersionButton.setEnabled(false);
1122	1138
1123	1139	cGridBag updown = new cGridBag().setVertical(true);
1124		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1125	1141	restoreButton.setToolTipText("Undo (restore current version)");
1126	1142	restoreButton.addActionListener(this);
1127	1143	restoreButton.setEnabled(false);
1128	1144
1129		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1130	1146	replaceButton.setToolTipText("Save (replace current version)");
1131	1147	replaceButton.addActionListener(this);
1132	1148	replaceButton.setEnabled(false);
1133	1149
1134		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
1135	1151
1136		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1137	1153	nextVersionButton.setToolTipText("Next version");
1138	1154	nextVersionButton.addActionListener(this);
1139	1155	nextVersionButton.setEnabled(false);
1140	1156
1141		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1142	1158	oneStepButton.setToolTipText("Animate one step forward");
1143	1159	oneStepButton.addActionListener(this);
1144	1160
..	..	@@ -1161,11 +1177,11 @@
1161	1177
1162	1178	if (Globals.ADVANCED)
1163	1179	{
1164		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1165	1181	snapobjectButton.addActionListener(this);
1166	1182	snapobjectButton.setToolTipText("Snap Object");
1167	1183
1168		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1169	1185	fourButton.addActionListener(this);
1170	1186	fourButton.setToolTipText("Show control panel only");
1171	1187	}
..	..	@@ -1173,83 +1189,85 @@
1173	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1174	1190
1175	1191
1176		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1177	1193	rootButton.setToolTipText("Open selection in new tab");
1178	1194	rootButton.addActionListener(this);
1179	1195
1180		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1181	1197	closeButton.setToolTipText("Close tab");
1182	1198	closeButton.addActionListener(this);
1183	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1184	1200	//clearButton.addActionListener(this);
1185	1201
1186	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1187	1204
1188	1205	// INSERT
1189		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1190	1207	gridButton.setToolTipText("Create ground");
1191	1208	gridButton.addActionListener(this);
1192	1209
1193		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1194	1211	boxButton.setToolTipText("Create box");
1195	1212	boxButton.addActionListener(this);
1196	1213
1197		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1198	1215	superButton.setToolTipText("Create superellipsoid");
1199	1216	superButton.addActionListener(this);
1200	1217
1201		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1202	1219	sphereButton.setToolTipText("Create sphere");
1203	1220	sphereButton.addActionListener(this);
1204	1221
1205		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1206	1223	coneButton.setToolTipText("Create cone");
1207	1224	coneButton.addActionListener(this);
1208	1225
1209		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1210	1227	torusButton.setToolTipText("Create torus");
1211	1228	torusButton.addActionListener(this);
1212	1229
1213		- if (Globals.ADVANCED)
	1230	+ if (false) //Globals.ADVANCED)
1214	1231	{
1215		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1233	kleinButton.setToolTipText("Create Klein bottle");
1217	1234	kleinButton.addActionListener(this);
1218	1235	}
1219	1236
1220		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1221	1238	particlesButton.setToolTipText("Create particle system");
1222	1239	particlesButton.addActionListener(this);
1223	1240
1224	1241	oe.toolboxPanel.add(row1);
1225	1242
1226	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1227	1245
1228		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1229	1247	groupButton.setToolTipText("Create group");
1230	1248	groupButton.addActionListener(this);
1231	1249
1232		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1233	1251	compositeButton.setToolTipText("Create composite");
1234	1252	compositeButton.addActionListener(this);
1235	1253
1236		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1237	1255	switchButton.setToolTipText("Create item switcher");
1238	1256	switchButton.addActionListener(this);
1239	1257
1240		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1241	1259	loopButton.setToolTipText("Create loop");
1242	1260	loopButton.addActionListener(this);
1243	1261
1244		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1245	1263	textureButton.setToolTipText("Create texture");
1246	1264	textureButton.addActionListener(this);
1247	1265
1248		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1249	1267	overlayButton.setToolTipText("Create overlay");
1250	1268	overlayButton.addActionListener(this);
1251	1269
1252		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1253	1271	lightButton.setToolTipText("Create light");
1254	1272	lightButton.addActionListener(this);
1255	1273
..	..	@@ -1259,7 +1277,10 @@
1259	1277
1260	1278	CreateTexturePanel(textures);
1261	1279
1262		- resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1263	1284
1264	1285	oe.toolboxPanel.add(textures);
1265	1286
..	..	@@ -1268,11 +1289,11 @@
1268	1289	CreateSkyboxPanel(oe.skyboxPanel);
1269	1290
1270	1291	// EDIT panel
1271		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1272	1293	editButton.setToolTipText("Pin selection controls");
1273	1294	editButton.addActionListener(this);
1274	1295
1275		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1276	1297	uneditButton.setToolTipText("Unpin and remove selection controls");
1277	1298	uneditButton.addActionListener(this);
1278	1299
..	..	@@ -1280,7 +1301,7 @@
1280	1301	allParamsButton.setToolTipText("Show all controls");
1281	1302	allParamsButton.addActionListener(this);
1282	1303
1283		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1284	1305	clearPanelButton.setToolTipText("Clear all controls");
1285	1306	clearPanelButton.addActionListener(this);
1286	1307
..	..	@@ -1288,7 +1309,7 @@
1288	1309	//unselectButton.setToolTipText("Unselect");
1289	1310	//unselectButton.addActionListener(this);
1290	1311
1291		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1292	1313	flashSelectionButton.setToolTipText("Highlight selection");
1293	1314	flashSelectionButton.addActionListener(this);
1294	1315
..	..	@@ -1311,6 +1332,8 @@
1311	1332
1312	1333	cGridBag jSPPanel = new cGridBag();
1313	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1314	1337	JScrollPane jSP;
1315	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1316	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1319,11 +1342,12 @@
1319	1342	oe.treePanel.add(jSPPanel);
1320	1343	oe.treePanel.Return();
1321	1344
1322		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1323	1346	oe.treePanel.Return();
1324		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1325		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1326		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1327	1351
1328	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1329	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1380,7 +1404,7 @@
1380	1404	// supportCB.setToolTipText("Enable rigging");
1381	1405	// supportCB.addItemListener(this);
1382	1406
1383		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1384	1408	freezeCB.setToolTipText("Fast moving camera");
1385	1409	freezeCB.addItemListener(this);
1386	1410
..	..	@@ -1389,9 +1413,12 @@
1389	1413
1390	1414	panel.Return();
1391	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1392	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1393	1419	crowdCB.setToolTipText("Used for crowds");
1394	1420	crowdCB.addItemListener(this);
	1421	+ }
1395	1422
1396	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1397	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1404,30 +1431,26 @@
1404	1431	minshaderCB.setToolTipText("Minimal fast shader");
1405	1432	minshaderCB.addItemListener(this);
1406	1433
1407		-// constraints.gridy += 1;
1408	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1409	1435	// speakerMocapCB.addItemListener(this);
1410	1436
1411		- panel.Return();
1412		-
1413	1437	if (false)
1414	1438	{
1415	1439	// handled in scripts
1416		- //constraints.gridy += 1;
1417	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1418	1441	speakerCameraCB.addItemListener(this);
1419	1442
1420		- //constraints.gridy += 1;
1421	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1422	1444	speakerFocusCB.addItemListener(this);
1423	1445
1424		- //constraints.gridy += 1;
1425		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1426		- smoothfocusCB.addItemListener(this);
1427	1446	panel.Return();
1428	1447	}
1429	1448
1430		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1431	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1432	1455	// debugCB.addItemListener(this);
1433	1456
..	..	@@ -1481,7 +1504,7 @@
1481	1504
1482	1505	void EditObject(Object3D obj)
1483	1506	{
1484		- assert(obj instanceof Composite);
	1507	+ //assert(obj instanceof Composite);
1485	1508
1486	1509	// if (obj.versionlist == null)
1487	1510	// {
..	..	@@ -2066,7 +2089,7 @@
2066	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
2067	2090	objEditor.ScreenFit(obj, false);
2068	2091
2069		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
2070	2093	refreshContents();
2071	2094	}
2072	2095
..	..	@@ -2103,7 +2126,7 @@
2103	2126	obj.parent.TransformToWorld(maxima); //, maxima);
2104	2127	}
2105	2128
2106		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
2107	2130
2108	2131	shadow.toParent = LA.newMatrix();
2109	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -2117,24 +2140,24 @@
2117	2140	switch(axis)
2118	2141	{
2119	2142	case 0 :
2120		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2121		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2122		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2123		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2124	2147	norm = cVector.X;
2125	2148	break;
2126	2149	case 1 :
2127		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2128		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2129		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2130		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2131	2154	norm = cVector.Y;
2132	2155	break;
2133	2156	case 2 :
2134		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2135		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2136		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2137		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2138	2161	norm = cVector.Z;
2139	2162	break;
2140	2163	}
..	..	@@ -2703,11 +2726,11 @@
2703	2726	if (!group.selection.isEmpty())
2704	2727	{
2705	2728	Composite csg = new GroupLeaf();
	2729	+ group(csg);
2706	2730	csg.count = 5;
2707	2731	Composite child = new cGroup("Branch");
2708	2732	csg.addChild(child);
2709	2733	child.addChild(csg);
2710		- group(csg);
2711	2734	}
2712	2735	} else
2713	2736	if (source == doubleItem)
..	..	@@ -2715,6 +2738,7 @@
2715	2738	if (!group.selection.isEmpty())
2716	2739	{
2717	2740	Composite csg = new GroupLeaf("Fork");
	2741	+ group(csg);
2718	2742	csg.count = 5;
2719	2743	Composite child = new cGroup("Branch A");
2720	2744	csg.addChild(child);
..	..	@@ -2722,7 +2746,6 @@
2722	2746	child = new cGroup("Branch B");
2723	2747	csg.addChild(child);
2724	2748	child.addChild(csg);
2725		- group(csg);
2726	2749	}
2727	2750	} else
2728	2751	if (source == tripleItem)
..	..	@@ -2788,7 +2811,7 @@
2788	2811	{
2789	2812	Maximize();
2790	2813	} else
2791		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2792	2815	{
2793	2816	ToggleFullScreen();
2794	2817	} else
..	..	@@ -2797,13 +2820,13 @@
2797	2820	this.expandedLayout = radio.layout;
2798	2821	CollapseToolbar();
2799	2822	} else
2800		- if (source == maximize3DButton)
2801		- {
2802		- this.expandedLayout = radio.layout;
2803		- radio.layout = twoButton;
2804		- Show3DView();
2805		- CollapseToolbar();
2806		- } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
2807	2830	if (source == previousVersionButton)
2808	2831	{
2809	2832	// Go to previous version
..	..	@@ -2831,7 +2854,7 @@
2831	2854	if (source == saveVersionButton)
2832	2855	{
2833	2856	// Save a new version
2834		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2835	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2836	2859	} else
2837	2860	if (source == deleteVersionButton)
..	..	@@ -3456,6 +3479,10 @@
3456	3479	{
3457	3480	ClearMaterials();
3458	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
3459	3486	if (source == liveleavesItem)
3460	3487	{
3461	3488	LiveLeaves(true);
..	..	@@ -3595,6 +3622,18 @@
3595	3622	if (source == transformChildrenItem)
3596	3623	{
3597	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3598	3637	} else
3599	3638	if (source == resetTransformItem)
3600	3639	{
..	..	@@ -3968,6 +4007,9 @@
3968	4007	if (source == closeButton)
3969	4008	{
3970	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3971	4013	cRadio ab;
3972	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3973	4015	{
..	..	@@ -4066,6 +4108,9 @@
4066	4108	} else
4067	4109	if(source instanceof cRadio)
4068	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
4069	4114	group.parent = keepparent;
4070	4115	group.attributes = 0;
4071	4116	//group.editWindow = null;
..	..	@@ -4117,17 +4162,28 @@
4117	4162	*/
4118	4163	radio.layout.doClick();
4119	4164
4120		- assert(copy instanceof Composite);
	4165	+ //assert(copy instanceof Composite);
4121	4166
4122	4167	if (copy.versionlist == null)
4123	4168	{
4124		- copy.versionlist = new Object3D[100];
4125	4169	copy.versionindex = -1;
4126	4170
4127	4171	// Cannot work with loops
4128		- // To fix this issue, first mark all nodes above the root,
	4172	+ // To fix this issue, we first mark all nodes above the root,
4129	4173	// and check if any of these nodes are reachable below the root.
4130		- //Save(true);
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
4131	4187	}
4132	4188
4133	4189	SetVersionStates();
..	..	@@ -4245,9 +4301,46 @@
4245	4301	refreshContents();
4246	4302	}
4247	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
4248	4316	void ResetTransform()
4249	4317	{
4250	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
4251	4344	}
4252	4345
4253	4346	void ResetTransform(int mask)
..	..	@@ -4260,42 +4353,8 @@
4260	4353	if (obj.toParent == null)
4261	4354	continue;
4262	4355
4263		- if (mask == -1)
4264		- {
4265		- if (obj instanceof Camera) // jan 2014
4266		- {
4267		- LA.matIdentity(obj.toParent);
4268		- LA.matIdentity(obj.fromParent);
4269		- }
4270		- else
4271		- {
4272		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4273		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4274		- }
4275		- TouchTransform(obj);
4276		- continue;
4277		- }
4278		- if ((mask&2) != 0) // Scale
4279		- {
4280		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4281		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4282		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4283		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4284		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4285		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4286		- }
4287		- if ((mask&4) != 0) // Rotation
4288		- {
4289		- // ?
4290		- }
4291		- if ((mask&1) != 0) // Translation
4292		- {
4293		- if (obj.toParent != null)
4294		- {
4295		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4296		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4297		- }
4298		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4299	4358	if (obj.parent == null)
4300	4359	{
4301	4360	System.out.println("NULL PARENT!");
..	..	@@ -4804,10 +4863,17 @@
4804	4863	{
4805	4864	Object3D obj = group.selection.get(i);
4806	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4807	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4808	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4809	4874	}
4810	4875
	4876	+ Globals.lighttouched = true;
4811	4877	refreshContents();
4812	4878	}
4813	4879
..	..	@@ -5095,6 +5161,12 @@
5095	5161	refreshContents();
5096	5162	}
5097	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
5098	5170	void FlipV(boolean flip)
5099	5171	{
5100	5172	group.selection.FlipV(flip);
..	..	@@ -5333,10 +5405,10 @@
5333	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5334	5406	// a camera
5335	5407	{
5336		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5337	5409	{
5338	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5339		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5340	5412	}
5341	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5342	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5380,11 +5452,12 @@
5380	5452	}
5381	5453	}
5382	5454
5383		- rootButton.setEnabled(allComposites);
	5455	+ rootButton.setEnabled(true); // allComposites);
5384	5456	}
5385	5457
5386	5458	void refreshContents(boolean cp)
5387	5459	{
	5460	+ if (Globals.SHOWINFO)
5388	5461	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5389	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5390	5463	{
..	..	@@ -6335,6 +6408,7 @@
6335	6408	private MenuItem clipMeshItem;
6336	6409	private MenuItem smoothMeshItem;
6337	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6338	6412
6339	6413	private MenuItem liveleavesItem;
6340	6414	private MenuItem unliveleavesItem;
..	..	@@ -6358,6 +6432,9 @@
6358	6432	private MenuItem maxTexturesItem;
6359	6433	private MenuItem panoTexturesItem;
6360	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6361	6438	private MenuItem resetCentroidItem;
6362	6439	private MenuItem resetCentroidXZItem;
6363	6440	private MenuItem resetTransformItem;