~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;
..	..	@@ -415,13 +405,15 @@
415	405	this.copy = this.group = group;
416	406	//selectees = this.group.selectees;
417	407
418		- if (copy.versionlist == null)
419		- {
420		- copy.versionlist = new Object3D[100];
421		- copy.versionindex = -1;
422		-
423		- Save(true);
424		- }
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
425	417
426	418	if(ui)
427	419	SetupUI(objEditor);
..	..	@@ -444,13 +436,13 @@
444	436
445	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
446	438
447		- if (copy.versionlist == null)
448		- {
449		- copy.versionlist = new Object3D[100];
450		- copy.versionindex = -1;
451		-
452		- Save(true);
453		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
454	446	}
455	447
456	448	void CloneSelection(boolean supports)
..	..	@@ -491,11 +483,16 @@
491	483
492	484	Object3D parent = obj.parent;
493	485	obj.parent = null;
	486	+
494	487	// Object3D support = obj.support;
495	488	// obj.support = null;
496	489	if (!supports)
497	490	obj.SaveSupports();
	491	+
498	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
499	496	obj.parent = parent;
500	497	// obj.support = support;
501	498	// clone.support = support; // aout 2013
..	..	@@ -565,8 +562,10 @@
565	562	pasteLinkItem.addActionListener(this);
566	563	pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
567	564	pasteCloneItem.addActionListener(this);
568		-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
569		-// pasteExpandItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
570	569	//menu.add("-");
571	570	oe.jTree.popup.addSeparator();
572	571
..	..	@@ -763,9 +762,9 @@
763	762	shadowYItem.addActionListener(this);
764	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
765	764	shadowZItem.addActionListener(this);
	765	+
766	766	attributeItem = menu.add(new MenuItem("Attribute"));
767	767	attributeItem.addActionListener(this);
768		-
769	768	if (Globals.ADVANCED)
770	769	{
771	770	menu.add("-");
..	..	@@ -777,11 +776,18 @@
777	776	pointflowItem.addActionListener(this);
778	777	}
779	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("-");
780	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
781	787	resetTransformItem.addActionListener(this);
782	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
783	789	resetCentroidItem.addActionListener(this);
784		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
785	791	resetCentroidXZItem.addActionListener(this);
786	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
787	793	transformGeometryItem.addActionListener(this);
..	..	@@ -797,7 +803,7 @@
797	803	genNormalsCADItem.addActionListener(this);
798	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
799	805	genNormalsMESHItem.addActionListener(this);
800		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
801	807	{
802	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
803	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -833,6 +839,8 @@
833	839	}
834	840
835	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
836	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
837	845	clearMaterialsItem.addActionListener(this);
838	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -855,9 +863,9 @@
855	863	hideleavesItem.addActionListener(this);
856	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
857	865	showleavesItem.addActionListener(this);
858		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
859	867	markleavesItem.addActionListener(this);
860		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
861	869	unmarkleavesItem.addActionListener(this);
862	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
863	871	rewindleavesItem.addActionListener(this);
..	..	@@ -934,6 +942,8 @@
934	942	cGridBag currenttab;
935	943	//boolean added; // patch for jar
936	944
	945	+ int totalcount = 0;
	946	+
937	947	int tabcount = 0;
938	948	int colcount = 0;
939	949	int rowcount = 0;
..	..	@@ -956,13 +966,13 @@
956	966	currenttab.setName(tabname);
957	967	//added = false;
958	968	resourcecontainer.add(currenttab);
959		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
960	970	rowcount = 1;
961	971	colcount = 0;
962	972	texturecount = 0;
963	973	}
964	974
965		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
966	976	{
967	977	//if (!added)
968	978	{
..	..	@@ -971,7 +981,13 @@
971	981	currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
972	982	}
973	983
974		- 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++;
975	991
976	992	if (++colcount >= columns)
977	993	{
..	..	@@ -997,6 +1013,8 @@
997	1013	container.add(resourcecontainer);
998	1014
999	1015	Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
1000	1018	}
1001	1019
1002	1020	void SetupUI2(ObjEditor oe)
..	..	@@ -1036,9 +1054,9 @@
1036	1054	oe.radioPanel.add(dummyButton);
1037	1055	oe.buttonGroup.add(dummyButton);
1038	1056	*/
1039		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
1040	1058
1041		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
1042	1060
1043	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1044	1062
..	..	@@ -1065,25 +1083,29 @@
1065	1083	// }
1066	1084	// });
1067	1085
1068		- 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);
1069	1091	collapseButton.setToolTipText("Collapse toolbar");
1070	1092	collapseButton.addActionListener(this);
1071	1093
1072		- oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1073		- maximize3DButton.setToolTipText("Maximize 3D view");
1074		- 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);
1075	1097
1076		- 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);
1077	1099	twoButton.setToolTipText("Show 3D view only");
1078	1100	twoButton.addActionListener(this);
1079	1101	this.fullscreenLayout = twoButton;
1080	1102
1081		- 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);
1082	1104	threeButton.setToolTipText("Show controls and 3D view");
1083	1105	threeButton.addActionListener(this);
1084	1106	if (Globals.ADVANCED)
1085	1107	{
1086		- 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);
1087	1109	sixButton.setToolTipText("Show 3D view and controls");
1088	1110	sixButton.addActionListener(this);
1089	1111	}
..	..	@@ -1092,50 +1114,47 @@
1092	1114	// sevenButton.addActionListener(this);
1093	1115	//
1094	1116
1095		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1096		- fullButton.setToolTipText("Full-screen window");
1097		- fullButton.addActionListener(this);
1098		-
1099		- 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);
1100	1118	screenfitButton.setToolTipText("Screen fit");
1101	1119	screenfitButton.addActionListener(this);
1102	1120
1103		- 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);
1104	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
1105	1123	restoreCameraButton.addActionListener(this);
1106	1124
1107		- 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);
1108	1126	saveVersionButton.setToolTipText("Duplicate current version");
1109	1127	saveVersionButton.addActionListener(this);
1110	1128
1111		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112	1130	deleteVersionButton.setToolTipText("Delete current version");
1113	1131	deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
1114	1133
1115		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116	1135	previousVersionButton.setToolTipText("Previous version");
1117	1136	previousVersionButton.addActionListener(this);
1118	1137	previousVersionButton.setEnabled(false);
1119	1138
1120	1139	cGridBag updown = new cGridBag().setVertical(true);
1121		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1122	1141	restoreButton.setToolTipText("Undo (restore current version)");
1123	1142	restoreButton.addActionListener(this);
1124		- //restoreButton.setEnabled(false);
	1143	+ restoreButton.setEnabled(false);
1125	1144
1126		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1127	1146	replaceButton.setToolTipText("Save (replace current version)");
1128	1147	replaceButton.addActionListener(this);
1129		- //replaceButton.setEnabled(false);
	1148	+ replaceButton.setEnabled(false);
1130	1149
1131		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
1132	1151
1133		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1134	1153	nextVersionButton.setToolTipText("Next version");
1135	1154	nextVersionButton.addActionListener(this);
1136	1155	nextVersionButton.setEnabled(false);
1137	1156
1138		- 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);
1139	1158	oneStepButton.setToolTipText("Animate one step forward");
1140	1159	oneStepButton.addActionListener(this);
1141	1160
..	..	@@ -1158,11 +1177,11 @@
1158	1177
1159	1178	if (Globals.ADVANCED)
1160	1179	{
1161		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162	1181	snapobjectButton.addActionListener(this);
1163	1182	snapobjectButton.setToolTipText("Snap Object");
1164	1183
1165		- 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);
1166	1185	fourButton.addActionListener(this);
1167	1186	fourButton.setToolTipText("Show control panel only");
1168	1187	}
..	..	@@ -1170,83 +1189,85 @@
1170	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1171	1190
1172	1191
1173		- 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);
1174	1193	rootButton.setToolTipText("Open selection in new tab");
1175	1194	rootButton.addActionListener(this);
1176	1195
1177		- 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);
1178	1197	closeButton.setToolTipText("Close tab");
1179	1198	closeButton.addActionListener(this);
1180	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1181	1200	//clearButton.addActionListener(this);
1182	1201
1183	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1184	1204
1185	1205	// INSERT
1186		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1207	gridButton.setToolTipText("Create ground");
1188	1208	gridButton.addActionListener(this);
1189	1209
1190		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191	1211	boxButton.setToolTipText("Create box");
1192	1212	boxButton.addActionListener(this);
1193	1213
1194		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195	1215	superButton.setToolTipText("Create superellipsoid");
1196	1216	superButton.addActionListener(this);
1197	1217
1198		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199	1219	sphereButton.setToolTipText("Create sphere");
1200	1220	sphereButton.addActionListener(this);
1201	1221
1202		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1203	1223	coneButton.setToolTipText("Create cone");
1204	1224	coneButton.addActionListener(this);
1205	1225
1206		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1207	1227	torusButton.setToolTipText("Create torus");
1208	1228	torusButton.addActionListener(this);
1209	1229
1210		- if (Globals.ADVANCED)
	1230	+ if (false) //Globals.ADVANCED)
1211	1231	{
1212		- 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);
1213	1233	kleinButton.setToolTipText("Create Klein bottle");
1214	1234	kleinButton.addActionListener(this);
1215	1235	}
1216	1236
1217		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1218	1238	particlesButton.setToolTipText("Create particle system");
1219	1239	particlesButton.addActionListener(this);
1220	1240
1221	1241	oe.toolboxPanel.add(row1);
1222	1242
1223	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1224	1245
1225		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1226	1247	groupButton.setToolTipText("Create group");
1227	1248	groupButton.addActionListener(this);
1228	1249
1229		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1230	1251	compositeButton.setToolTipText("Create composite");
1231	1252	compositeButton.addActionListener(this);
1232	1253
1233		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1234	1255	switchButton.setToolTipText("Create item switcher");
1235	1256	switchButton.addActionListener(this);
1236	1257
1237		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1238	1259	loopButton.setToolTipText("Create loop");
1239	1260	loopButton.addActionListener(this);
1240	1261
1241		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1242	1263	textureButton.setToolTipText("Create texture");
1243	1264	textureButton.addActionListener(this);
1244	1265
1245		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1246	1267	overlayButton.setToolTipText("Create overlay");
1247	1268	overlayButton.addActionListener(this);
1248	1269
1249		- 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);
1250	1271	lightButton.setToolTipText("Create light");
1251	1272	lightButton.addActionListener(this);
1252	1273
..	..	@@ -1256,6 +1277,11 @@
1256	1277
1257	1278	CreateTexturePanel(textures);
1258	1279
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
1259	1285	oe.toolboxPanel.add(textures);
1260	1286
1261	1287	textures.preferredHeight = 100;
..	..	@@ -1263,11 +1289,11 @@
1263	1289	CreateSkyboxPanel(oe.skyboxPanel);
1264	1290
1265	1291	// EDIT panel
1266		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1267	1293	editButton.setToolTipText("Pin selection controls");
1268	1294	editButton.addActionListener(this);
1269	1295
1270		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1271	1297	uneditButton.setToolTipText("Unpin and remove selection controls");
1272	1298	uneditButton.addActionListener(this);
1273	1299
..	..	@@ -1275,7 +1301,7 @@
1275	1301	allParamsButton.setToolTipText("Show all controls");
1276	1302	allParamsButton.addActionListener(this);
1277	1303
1278		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1279	1305	clearPanelButton.setToolTipText("Clear all controls");
1280	1306	clearPanelButton.addActionListener(this);
1281	1307
..	..	@@ -1283,7 +1309,7 @@
1283	1309	//unselectButton.setToolTipText("Unselect");
1284	1310	//unselectButton.addActionListener(this);
1285	1311
1286		- 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);
1287	1313	flashSelectionButton.setToolTipText("Highlight selection");
1288	1314	flashSelectionButton.addActionListener(this);
1289	1315
..	..	@@ -1306,6 +1332,8 @@
1306	1332
1307	1333	cGridBag jSPPanel = new cGridBag();
1308	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1309	1337	JScrollPane jSP;
1310	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1311	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1314,11 +1342,12 @@
1314	1342	oe.treePanel.add(jSPPanel);
1315	1343	oe.treePanel.Return();
1316	1344
1317		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1318	1346	oe.treePanel.Return();
1319		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1320		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1321		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1322	1351
1323	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1324	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1375,7 +1404,7 @@
1375	1404	// supportCB.setToolTipText("Enable rigging");
1376	1405	// supportCB.addItemListener(this);
1377	1406
1378		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1379	1408	freezeCB.setToolTipText("Fast moving camera");
1380	1409	freezeCB.addItemListener(this);
1381	1410
..	..	@@ -1384,9 +1413,12 @@
1384	1413
1385	1414	panel.Return();
1386	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1387	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1388	1419	crowdCB.setToolTipText("Used for crowds");
1389	1420	crowdCB.addItemListener(this);
	1421	+ }
1390	1422
1391	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1392	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1399,30 +1431,26 @@
1399	1431	minshaderCB.setToolTipText("Minimal fast shader");
1400	1432	minshaderCB.addItemListener(this);
1401	1433
1402		-// constraints.gridy += 1;
1403	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1404	1435	// speakerMocapCB.addItemListener(this);
1405	1436
1406		- panel.Return();
1407		-
1408	1437	if (false)
1409	1438	{
1410	1439	// handled in scripts
1411		- //constraints.gridy += 1;
1412	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1413	1441	speakerCameraCB.addItemListener(this);
1414	1442
1415		- //constraints.gridy += 1;
1416	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1417	1444	speakerFocusCB.addItemListener(this);
1418	1445
1419		- //constraints.gridy += 1;
1420		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1421		- smoothfocusCB.addItemListener(this);
1422	1446	panel.Return();
1423	1447	}
1424	1448
1425		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1426	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1427	1455	// debugCB.addItemListener(this);
1428	1456
..	..	@@ -1476,7 +1504,7 @@
1476	1504
1477	1505	void EditObject(Object3D obj)
1478	1506	{
1479		- assert(obj instanceof Composite);
	1507	+ //assert(obj instanceof Composite);
1480	1508
1481	1509	// if (obj.versionlist == null)
1482	1510	// {
..	..	@@ -2061,7 +2089,7 @@
2061	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
2062	2090	objEditor.ScreenFit(obj, false);
2063	2091
2064		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
2065	2093	refreshContents();
2066	2094	}
2067	2095
..	..	@@ -2098,7 +2126,7 @@
2098	2126	obj.parent.TransformToWorld(maxima); //, maxima);
2099	2127	}
2100	2128
2101		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
2102	2130
2103	2131	shadow.toParent = LA.newMatrix();
2104	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -2112,24 +2140,24 @@
2112	2140	switch(axis)
2113	2141	{
2114	2142	case 0 :
2115		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2116		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2117		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2118		- 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;
2119	2147	norm = cVector.X;
2120	2148	break;
2121	2149	case 1 :
2122		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2123		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2124		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2125		- 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;
2126	2154	norm = cVector.Y;
2127	2155	break;
2128	2156	case 2 :
2129		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2130		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2131		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2132		- 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;
2133	2161	norm = cVector.Z;
2134	2162	break;
2135	2163	}
..	..	@@ -2698,11 +2726,11 @@
2698	2726	if (!group.selection.isEmpty())
2699	2727	{
2700	2728	Composite csg = new GroupLeaf();
	2729	+ group(csg);
2701	2730	csg.count = 5;
2702	2731	Composite child = new cGroup("Branch");
2703	2732	csg.addChild(child);
2704	2733	child.addChild(csg);
2705		- group(csg);
2706	2734	}
2707	2735	} else
2708	2736	if (source == doubleItem)
..	..	@@ -2710,6 +2738,7 @@
2710	2738	if (!group.selection.isEmpty())
2711	2739	{
2712	2740	Composite csg = new GroupLeaf("Fork");
	2741	+ group(csg);
2713	2742	csg.count = 5;
2714	2743	Composite child = new cGroup("Branch A");
2715	2744	csg.addChild(child);
..	..	@@ -2717,7 +2746,6 @@
2717	2746	child = new cGroup("Branch B");
2718	2747	csg.addChild(child);
2719	2748	child.addChild(csg);
2720		- group(csg);
2721	2749	}
2722	2750	} else
2723	2751	if (source == tripleItem)
..	..	@@ -2783,7 +2811,7 @@
2783	2811	{
2784	2812	Maximize();
2785	2813	} else
2786		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2787	2815	{
2788	2816	ToggleFullScreen();
2789	2817	} else
..	..	@@ -2792,13 +2820,13 @@
2792	2820	this.expandedLayout = radio.layout;
2793	2821	CollapseToolbar();
2794	2822	} else
2795		- if (source == maximize3DButton)
2796		- {
2797		- this.expandedLayout = radio.layout;
2798		- radio.layout = twoButton;
2799		- Show3DView();
2800		- CollapseToolbar();
2801		- } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
2802	2830	if (source == previousVersionButton)
2803	2831	{
2804	2832	// Go to previous version
..	..	@@ -2826,7 +2854,7 @@
2826	2854	if (source == saveVersionButton)
2827	2855	{
2828	2856	// Save a new version
2829		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2830	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2831	2859	} else
2832	2860	if (source == deleteVersionButton)
..	..	@@ -3451,6 +3479,10 @@
3451	3479	{
3452	3480	ClearMaterials();
3453	3481	} else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
3454	3486	if (source == liveleavesItem)
3455	3487	{
3456	3488	LiveLeaves(true);
..	..	@@ -3590,6 +3622,18 @@
3590	3622	if (source == transformChildrenItem)
3591	3623	{
3592	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);
3593	3637	} else
3594	3638	if (source == resetTransformItem)
3595	3639	{
..	..	@@ -3963,6 +4007,9 @@
3963	4007	if (source == closeButton)
3964	4008	{
3965	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3966	4013	cRadio ab;
3967	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3968	4015	{
..	..	@@ -4061,6 +4108,9 @@
4061	4108	} else
4062	4109	if(source instanceof cRadio)
4063	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
4064	4114	group.parent = keepparent;
4065	4115	group.attributes = 0;
4066	4116	//group.editWindow = null;
..	..	@@ -4112,17 +4162,28 @@
4112	4162	*/
4113	4163	radio.layout.doClick();
4114	4164
4115		- assert(copy instanceof Composite);
	4165	+ //assert(copy instanceof Composite);
4116	4166
4117	4167	if (copy.versionlist == null)
4118	4168	{
4119		- copy.versionlist = new Object3D[100];
4120	4169	copy.versionindex = -1;
4121	4170
4122	4171	// Cannot work with loops
4123		- // To fix this issue, first mark all nodes above the root,
	4172	+ // To fix this issue, we first mark all nodes above the root,
4124	4173	// and check if any of these nodes are reachable below the root.
4125		- //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);
4126	4187	}
4127	4188
4128	4189	SetVersionStates();
..	..	@@ -4240,9 +4301,46 @@
4240	4301	refreshContents();
4241	4302	}
4242	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	+
4243	4316	void ResetTransform()
4244	4317	{
4245	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();
4246	4344	}
4247	4345
4248	4346	void ResetTransform(int mask)
..	..	@@ -4255,42 +4353,8 @@
4255	4353	if (obj.toParent == null)
4256	4354	continue;
4257	4355
4258		- if (mask == -1)
4259		- {
4260		- if (obj instanceof Camera) // jan 2014
4261		- {
4262		- LA.matIdentity(obj.toParent);
4263		- LA.matIdentity(obj.fromParent);
4264		- }
4265		- else
4266		- {
4267		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4268		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4269		- }
4270		- TouchTransform(obj);
4271		- continue;
4272		- }
4273		- if ((mask&2) != 0) // Scale
4274		- {
4275		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4276		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4277		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4278		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4279		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4280		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4281		- }
4282		- if ((mask&4) != 0) // Rotation
4283		- {
4284		- // ?
4285		- }
4286		- if ((mask&1) != 0) // Translation
4287		- {
4288		- if (obj.toParent != null)
4289		- {
4290		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4291		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4292		- }
4293		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4294	4358	if (obj.parent == null)
4295	4359	{
4296	4360	System.out.println("NULL PARENT!");
..	..	@@ -4799,10 +4863,17 @@
4799	4863	{
4800	4864	Object3D obj = group.selection.get(i);
4801	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4802	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4803	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4804	4874	}
4805	4875
	4876	+ Globals.lighttouched = true;
4806	4877	refreshContents();
4807	4878	}
4808	4879
..	..	@@ -5090,6 +5161,12 @@
5090	5161	refreshContents();
5091	5162	}
5092	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
5093	5170	void FlipV(boolean flip)
5094	5171	{
5095	5172	group.selection.FlipV(flip);
..	..	@@ -5328,10 +5405,10 @@
5328	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5329	5406	// a camera
5330	5407	{
5331		- 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
5332	5409	{
5333	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5334		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5335	5412	}
5336	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5337	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5375,11 +5452,12 @@
5375	5452	}
5376	5453	}
5377	5454
5378		- rootButton.setEnabled(allComposites);
	5455	+ rootButton.setEnabled(true); // allComposites);
5379	5456	}
5380	5457
5381	5458	void refreshContents(boolean cp)
5382	5459	{
	5460	+ if (Globals.SHOWINFO)
5383	5461	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5384	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5385	5463	{
..	..	@@ -6330,6 +6408,7 @@
6330	6408	private MenuItem clipMeshItem;
6331	6409	private MenuItem smoothMeshItem;
6332	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6333	6412
6334	6413	private MenuItem liveleavesItem;
6335	6414	private MenuItem unliveleavesItem;
..	..	@@ -6353,6 +6432,9 @@
6353	6432	private MenuItem maxTexturesItem;
6354	6433	private MenuItem panoTexturesItem;
6355	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6356	6438	private MenuItem resetCentroidItem;
6357	6439	private MenuItem resetCentroidXZItem;
6358	6440	private MenuItem resetTransformItem;