~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,6 +24,17 @@
24	24
25	25	private UUID uuid = UUID.randomUUID();
26	26
	27	+ // TEMPORARY for mocap undo. No need to be transient.
	28	+ mocap.reader.BVHReader.BVHResult savebvh;
	29	+ Object3D saveskeleton;
	30	+ //
	31	+
	32	+ String skyboxname;
	33	+ String skyboxext;
	34	+
	35	+ byte[] versions[];
	36	+ int versionindex = -1;
	37	+
27	38	ScriptNode scriptnode;
28	39
29	40	void InitOthers()
..	..	@@ -104,64 +115,178 @@
104	115
105	116	// transient boolean reduced; // for morph reduction
106	117
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	118	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	119	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	120
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	121	+ transient Object3D transientsupport; // for cloning
	122	+ transient boolean transientlink2master;
112	123
113		-void SaveSupports()
114		-{
115		- if (blockloop)
116		- return;
117		-
118		- transientsupport = support;
119		- transientlink2master = link2master;
120		-
121		- support = null;
122		- link2master = false;
123		-
124		- if (bRep != null)
	124	+ void SaveSupports()
125	125	{
126		- bRep.SaveSupports();
	126	+ if (blockloop)
	127	+ return;
	128	+
	129	+ transientsupport = support;
	130	+ transientlink2master = link2master;
	131	+
	132	+ support = null;
	133	+ link2master = false;
	134	+
	135	+ if (bRep != null)
	136	+ {
	137	+ bRep.SaveSupports();
	138	+ }
	139	+
	140	+ for (int i = 0; i < Size(); i++)
	141	+ {
	142	+ Object3D child = (Object3D) get(i);
	143	+ if (child == null)
	144	+ continue;
	145	+ blockloop = true;
	146	+ child.SaveSupports();
	147	+ blockloop = false;
	148	+ }
127	149	}
128		-
129		- for (int i = 0; i < Size(); i++)
	150	+
	151	+ void RestoreSupports()
130	152	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	153	+ if (blockloop)
	154	+ return;
	155	+
	156	+ support = transientsupport;
	157	+ link2master = transientlink2master;
	158	+ transientsupport = null;
	159	+ transientlink2master = false;
	160	+
	161	+ if (bRep != null)
	162	+ {
	163	+ bRep.RestoreSupports();
	164	+ }
	165	+
	166	+ for (int i = 0; i < Size(); i++)
	167	+ {
	168	+ Object3D child = (Object3D) get(i);
	169	+ if (child == null)
	170	+ continue;
	171	+ blockloop = true;
	172	+ child.RestoreSupports();
	173	+ blockloop = false;
	174	+ }
	175	+ }
	176	+
	177	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	178	+ {
	179	+ Object3D o;
	180	+
	181	+ if (hashtable.containsKey(GetUUID()))
	182	+ {
	183	+ o = hashtable.get(GetUUID());
	184	+
	185	+ Grafreed.Assert(this.bRep == o.bRep);
	186	+ //if (this.bRep != null)
	187	+ // assert(this.bRep.support == o.transientrep);
	188	+ if (this.support != null)
	189	+ assert(this.support.bRep == o.transientrep);
	190	+ }
	191	+ else
	192	+ {
	193	+ o = new Object3D("copy of " + this.name);
	194	+
	195	+ hashtable.put(GetUUID(), o);
	196	+ }
	197	+
	198	+ if (!blockloop)
	199	+ {
	200	+ blockloop = true;
	201	+
	202	+ for (int i=0; i<Size(); i++)
	203	+ {
	204	+ get(i).ExtractBigData(hashtable);
	205	+ }
	206	+
	207	+ blockloop = false;
	208	+ }
	209	+
	210	+ ExtractBigData(o);
	211	+ }
	212	+
	213	+ void ExtractBigData(Object3D o)
	214	+ {
	215	+ if (o.bRep != null)
	216	+ Grafreed.Assert(o.bRep == this.bRep);
	217	+
	218	+ o.bRep = this.bRep;
	219	+// July 2019 if (this.bRep != null)
	220	+// {
	221	+// o.transientrep = this.bRep.support;
	222	+// o.bRep.support = null;
	223	+// }
	224	+ o.selection = this.selection;
	225	+ o.versions = this.versions;
	226	+ o.versionindex = this.versionindex;
	227	+
	228	+ if (this.support != null)
	229	+ {
	230	+ if (o.transientrep != null)
	231	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	232	+
	233	+ o.transientrep = this.support.bRep;
	234	+ this.support.bRep = null;
	235	+ }
	236	+
	237	+ // o.support = this.support;
	238	+ // o.fileparent = this.fileparent;
	239	+ // if (this.bRep != null)
	240	+ // o.bRep = this.bRep.support;
	241	+
	242	+ this.bRep = null;
	243	+ // if (this.bRep != null)
	244	+ // this.bRep.support = null;
	245	+ // this.support = null;
	246	+ // this.fileparent = null;
	247	+ }
	248	+
	249	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	250	+ {
	251	+ if (!hashtable.containsKey(GetUUID()))
	252	+ return;
	253	+
	254	+ Object3D o = hashtable.get(GetUUID());
	255	+
	256	+ RestoreBigData(o);
	257	+
	258	+ if (blockloop)
	259	+ return;
	260	+
134	261	blockloop = true;
135		- child.SaveSupports();
	262	+
	263	+ //hashtable.remove(GetUUID());
	264	+
	265	+ for (int i=0; i<Size(); i++)
	266	+ {
	267	+ get(i).RestoreBigData(hashtable);
	268	+ }
	269	+
136	270	blockloop = false;
137	271	}
138		-}
139	272
140		-void RestoreSupports()
141		-{
142		- if (blockloop)
143		- return;
144		-
145		- support = transientsupport;
146		- link2master = transientlink2master;
147		- transientsupport = null;
148		- transientlink2master = false;
149		-
150		- if (bRep != null)
	273	+ void RestoreBigData(Object3D o)
151	274	{
152		- bRep.RestoreSupports();
	275	+ this.bRep = o.bRep;
	276	+ if (this.support != null && o.transientrep != null)
	277	+ {
	278	+ this.support.bRep = o.transientrep;
	279	+ }
	280	+
	281	+ this.selection = o.selection;
	282	+
	283	+ this.versions = o.versions;
	284	+ this.versionindex = o.versionindex;
	285	+// July 2019 if (this.bRep != null)
	286	+// this.bRep.support = o.transientrep;
	287	+ // this.support = o.support;
	288	+ // this.fileparent = o.fileparent;
153	289	}
154		-
155		- for (int i = 0; i < Size(); i++)
156		- {
157		- Object3D child = (Object3D) get(i);
158		- if (child == null)
159		- continue;
160		- blockloop = true;
161		- child.RestoreSupports();
162		- blockloop = false;
163		- }
164		-}
165	290
166	291	// MOCAP SUPPORT
167	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -304,6 +429,7 @@
304	429	}
305	430
306	431	boolean live = false;
	432	+ transient boolean keepdontselect;
307	433	boolean dontselect = false;
308	434	boolean hide = false;
309	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -486,12 +612,14 @@
486	612	toParent = LA.newMatrix();
487	613	fromParent = LA.newMatrix();
488	614	}
	615	+
489	616	if (toParentMarked == null)
490	617	{
491	618	if (maxcount != 1)
492	619	{
493	620	new Exception().printStackTrace();
494	621	}
	622	+
495	623	toParentMarked = LA.newMatrix();
496	624	fromParentMarked = LA.newMatrix();
497	625	}
..	..	@@ -802,7 +930,7 @@
802	930
803	931	if (marked && Globals.isLIVE() && live &&
804	932	//TEMP21aug2018
805		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
806	934	currentframe != Globals.framecount)
807	935	{
808	936	currentframe = Globals.framecount;
..	..	@@ -814,7 +942,8 @@
814	942
815	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
816	944
817		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
818	947	{
819	948	countdown = 1;
820	949	delay = speedup?8:1;
..	..	@@ -886,6 +1015,7 @@
886	1015	if (material == null \|\| material.multiply)
887	1016	return true;
888	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
889	1019	return material.opacity > 0.99;
890	1020	}
891	1021
..	..	@@ -1286,6 +1416,7 @@
1286	1416	toParent = LA.newMatrix();
1287	1417	fromParent = LA.newMatrix();
1288	1418	}
	1419	+
1289	1420	LA.matCopy(other.toParent, toParent);
1290	1421	LA.matCopy(other.fromParent, fromParent);
1291	1422
..	..	@@ -2307,6 +2438,10 @@
2307	2438	}
2308	2439	*/
2309	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2310	2445	}
2311	2446
2312	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2348,6 +2483,14 @@
2348	2483	{
2349	2484	editWindow.refreshContents();
2350	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2351	2494	//if (parent != null)
2352	2495	//parent.refreshEditWindow();
2353	2496	}
..	..	@@ -2427,7 +2570,8 @@
2427	2570	private static final int editSelf = 1;
2428	2571	private static final int editChild = 2;
2429	2572
2430		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2431	2575	{
2432	2576	if (level == 0)
2433	2577	{
..	..	@@ -2435,7 +2579,8 @@
2435	2579	return;
2436	2580
2437	2581	Object3D selectee;
2438		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2582	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2583	+ level + 1))
2439	2584	{
2440	2585	selectee = (Object3D) e.nextElement();
2441	2586	}
..	..	@@ -2443,19 +2588,22 @@
2443	2588	} else
2444	2589	{
2445	2590	//super.
2446		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2447	2593	}
2448	2594	}
2449	2595
2450		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2451	2598	{
2452	2599	doSomething = 0;
2453	2600	if (level == 0)
2454	2601	{
2455		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2456	2603	}
2457	2604	if (//super.
2458		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2459	2607	{
2460	2608	doSomething = 1;
2461	2609	return true;
..	..	@@ -2465,7 +2613,7 @@
2465	2613	}
2466	2614	}
2467	2615
2468		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2469	2617	{
2470	2618	if (selection == null)
2471	2619	{
..	..	@@ -2478,7 +2626,8 @@
2478	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2479	2627	{
2480	2628	Object3D selectee = (Object3D) e.nextElement();
2481		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2482	2631	{
2483	2632	childToDrag = selectee;
2484	2633	doSomething = 2;
..	..	@@ -2490,13 +2639,15 @@
2490	2639	return retval;
2491	2640	}
2492	2641
2493		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2494	2644	{
2495	2645	switch (doSomething)
2496	2646	{
2497	2647	case 1: // '\001'
2498	2648	//super.
2499		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2500	2651	break;
2501	2652
2502	2653	case 2: // '\002'
..	..	@@ -2509,11 +2660,13 @@
2509	2660	{
2510	2661	//sel.hitSomething = childToDrag.hitSomething;
2511	2662	//childToDrag.doEditDrag(info);
2512		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2513	2665	} else
2514	2666	{
2515	2667	//super.
2516		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2517	2670	}
2518	2671	}
2519	2672	break;
..	..	@@ -2531,6 +2684,9 @@
2531	2684	{
2532	2685	deselectAll();
2533	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2534	2690	ClickInfo newInfo = new ClickInfo();
2535	2691	newInfo.flags = info.flags;
2536	2692	newInfo.bounds = info.bounds;
..	..	@@ -2623,6 +2779,18 @@
2623	2779	void GenNormalsS(boolean crease)
2624	2780	{
2625	2781	selection.GenNormals(crease);
	2782	+// for (int i=0; i<selection.size(); i++)
	2783	+// {
	2784	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2785	+// selectee.GenNormals(crease);
	2786	+// }
	2787	+
	2788	+ //Touch();
	2789	+ }
	2790	+
	2791	+ void GenNormalsMeshS()
	2792	+ {
	2793	+ selection.GenNormalsMesh();
2626	2794	// for (int i=0; i<selection.size(); i++)
2627	2795	// {
2628	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2763,6 +2931,24 @@
2763	2931	if (child == null)
2764	2932	continue;
2765	2933	child.GenNormals(crease);
	2934	+// Children().release(i);
	2935	+ }
	2936	+ blockloop = false;
	2937	+ }
	2938	+
	2939	+ void GenNormalsMesh()
	2940	+ {
	2941	+ if (blockloop)
	2942	+ return;
	2943	+
	2944	+ blockloop = true;
	2945	+ GenNormalsMesh0();
	2946	+ for (int i = 0; i < Children().Size(); i++)
	2947	+ {
	2948	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2949	+ if (child == null)
	2950	+ continue;
	2951	+ child.GenNormalsMesh();
2766	2952	// Children().release(i);
2767	2953	}
2768	2954	blockloop = false;
..	..	@@ -2935,11 +3121,20 @@
2935	3121	}
2936	3122	}
2937	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2938	3133	void GenNormalsMINE0()
2939	3134	{
2940	3135	if (bRep != null)
2941	3136	{
2942		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2943	3138	Touch();
2944	3139	}
2945	3140	}
..	..	@@ -3385,7 +3580,8 @@
3385	3580	if (blockloop)
3386	3581	return;
3387	3582
3388		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3389	3585	live = h;
3390	3586
3391	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3406,7 +3602,8 @@
3406	3602	return;
3407	3603
3408	3604	//if (bRep != null)
3409		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3410	3607	link2master = h;
3411	3608
3412	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3426,7 +3623,8 @@
3426	3623	if (blockloop)
3427	3624	return;
3428	3625
3429		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3430	3628	hide = h;
3431	3629
3432	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3446,7 +3644,7 @@
3446	3644	if (blockloop)
3447	3645	return;
3448	3646
3449		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3450	3648	marked = h;
3451	3649
3452	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3456,6 +3654,46 @@
3456	3654	continue;
3457	3655	blockloop = true;
3458	3656	child.MarkLeaves(h);
	3657	+ blockloop = false;
	3658	+ // release(i);
	3659	+ }
	3660	+ }
	3661	+
	3662	+ void RewindLeaves(boolean h)
	3663	+ {
	3664	+ if (blockloop)
	3665	+ return;
	3666	+
	3667	+ if (bRep != null \|\| material != null) // borderline...
	3668	+ rewind = h;
	3669	+
	3670	+ for (int i = 0; i < Size(); i++)
	3671	+ {
	3672	+ Object3D child = (Object3D) get(i); // reserve(i);
	3673	+ if (child == null)
	3674	+ continue;
	3675	+ blockloop = true;
	3676	+ child.RewindLeaves(h);
	3677	+ blockloop = false;
	3678	+ // release(i);
	3679	+ }
	3680	+ }
	3681	+
	3682	+ void RandomLeaves(boolean h)
	3683	+ {
	3684	+ if (blockloop)
	3685	+ return;
	3686	+
	3687	+ if (bRep != null \|\| material != null) // borderline...
	3688	+ random = h;
	3689	+
	3690	+ for (int i = 0; i < Size(); i++)
	3691	+ {
	3692	+ Object3D child = (Object3D) get(i); // reserve(i);
	3693	+ if (child == null)
	3694	+ continue;
	3695	+ blockloop = true;
	3696	+ child.RandomLeaves(h);
3459	3697	blockloop = false;
3460	3698	// release(i);
3461	3699	}
..	..	@@ -4233,6 +4471,55 @@
4233	4471	}
4234	4472	}
4235	4473
	4474	+ void RepairSOV()
	4475	+ {
	4476	+ if (blockloop)
	4477	+ return;
	4478	+
	4479	+ String texname = this.GetPigmentTexture();
	4480	+
	4481	+ if (texname.startsWith("sov"))
	4482	+ {
	4483	+ String[] s = texname.split("/");
	4484	+
	4485	+ String[] sname = s[1].split("Color.pn");
	4486	+
	4487	+ texname = sname[0];
	4488	+
	4489	+ if (sname.length > 1)
	4490	+ {
	4491	+ texname += "Color.jpg";
	4492	+ }
	4493	+
	4494	+ this.SetPigmentTexture("sov/" + texname);
	4495	+ }
	4496	+
	4497	+ texname = this.GetBumpTexture();
	4498	+
	4499	+ if (texname.startsWith("sov"))
	4500	+ {
	4501	+ String[] s = texname.split("/");
	4502	+
	4503	+ String[] sname = s[1].split("Bump.pn");
	4504	+
	4505	+ texname = sname[0];
	4506	+
	4507	+ if (sname.length > 1)
	4508	+ {
	4509	+ texname += "Bump.jpg";
	4510	+ }
	4511	+
	4512	+ this.SetBumpTexture("sov/" + texname);
	4513	+ }
	4514	+
	4515	+ for (int i=0; i<Size(); i++)
	4516	+ {
	4517	+ blockloop = true;
	4518	+ get(i).RepairSOV();
	4519	+ blockloop = false;
	4520	+ }
	4521	+ }
	4522	+
4236	4523	void RepairTexture()
4237	4524	{
4238	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4747,6 +5034,14 @@
4747	5034	}
4748	5035	}
4749	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4750	5045	cTreePath Select(int indexcount, boolean deselect)
4751	5046	{
4752	5047	if (hide \|\| dontselect)
..	..	@@ -4783,10 +5078,11 @@
4783	5078	if (leaf != null)
4784	5079	{
4785	5080	cTreePath tp = new cTreePath(this, leaf);
4786		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4787	5083	{
4788	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4789		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4790	5086	}
4791	5087
4792	5088	return tp;
..	..	@@ -4803,6 +5099,7 @@
4803	5099
4804	5100	if (child == null)
4805	5101	continue;
	5102	+
4806	5103	if (child.HasTransparency() && child.size() != 0)
4807	5104	{
4808	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4812,9 +5109,10 @@
4812	5109	if (leaf != null)
4813	5110	{
4814	5111	cTreePath tp = new cTreePath(this, leaf);
4815		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4816	5114	{
4817		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4818	5116	}
4819	5117
4820	5118	return tp;
..	..	@@ -5139,6 +5437,51 @@
5139	5437	blockloop = false;
5140	5438	}
5141	5439
	5440	+ void ResetSelectable()
	5441	+ {
	5442	+ if (blockloop)
	5443	+ return;
	5444	+
	5445	+ blockloop = true;
	5446	+
	5447	+ keepdontselect = dontselect;
	5448	+ dontselect = true;
	5449	+
	5450	+ Object3D child;
	5451	+ int nb = Size();
	5452	+ for (int i = 0; i < nb; i++)
	5453	+ {
	5454	+ child = (Object3D) get(i);
	5455	+ if (child == null)
	5456	+ continue;
	5457	+ child.ResetSelectable();
	5458	+ }
	5459	+
	5460	+ blockloop = false;
	5461	+ }
	5462	+
	5463	+ void RestoreSelectable()
	5464	+ {
	5465	+ if (blockloop)
	5466	+ return;
	5467	+
	5468	+ blockloop = true;
	5469	+
	5470	+ dontselect = keepdontselect;
	5471	+
	5472	+ Object3D child;
	5473	+ int nb = Size();
	5474	+ for (int i = 0; i < nb; i++)
	5475	+ {
	5476	+ child = (Object3D) get(i);
	5477	+ if (child == null)
	5478	+ continue;
	5479	+ child.RestoreSelectable();
	5480	+ }
	5481	+
	5482	+ blockloop = false;
	5483	+ }
	5484	+
5142	5485	boolean IsSelected()
5143	5486	{
5144	5487	if (parent == null)
..	..	@@ -5448,6 +5791,38 @@
5448	5791	}
5449	5792	}
5450	5793
	5794	+ void EmbedTextures(boolean embed)
	5795	+ {
	5796	+ if (blockloop)
	5797	+ return;
	5798	+
	5799	+ //if (GetTextures() != null)
	5800	+ if (embed)
	5801	+ CameraPane.EmbedTextures(GetTextures());
	5802	+ else
	5803	+ {
	5804	+ GetTextures().pigmentdata = null;
	5805	+ GetTextures().bumpdata = null;
	5806	+ GetTextures().pw = 0;
	5807	+ GetTextures().ph = 0;
	5808	+ GetTextures().bw = 0;
	5809	+ GetTextures().bh = 0;
	5810	+ }
	5811	+
	5812	+ int nb = Size();
	5813	+ for (int i = 0; i < nb; i++)
	5814	+ {
	5815	+ Object3D child = (Object3D) get(i);
	5816	+
	5817	+ if (child == null)
	5818	+ continue;
	5819	+
	5820	+ blockloop = true;
	5821	+ child.EmbedTextures(embed);
	5822	+ blockloop = false;
	5823	+ }
	5824	+ }
	5825	+
5451	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5452	5827	{
5453	5828	Draw(display, root, selected, blocked);
..	..	@@ -5456,12 +5831,23 @@
5456	5831	boolean NeedSupport()
5457	5832	{
5458	5833	return
5459		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5460	5835	// PROBLEM with CROWD!!
5461	5836	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5462	5837	}
5463	5838
5464	5839	static boolean DEBUG_SELECTION = false;
	5840	+
	5841	+ boolean IsLive()
	5842	+ {
	5843	+ if (live)
	5844	+ return true;
	5845	+
	5846	+ if (parent == null)
	5847	+ return false;
	5848	+
	5849	+ return parent.IsLive();
	5850	+ }
5465	5851
5466	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5467	5853	{
..	..	@@ -5524,7 +5910,7 @@
5524	5910	support = support;
5525	5911
5526	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5527		- boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
	5913	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5528	5914
5529	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5530	5916	{
..	..	@@ -5544,10 +5930,12 @@
5544	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5545	5931
5546	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5547		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5933	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5934	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5548	5935	{
5549	5936	Globals.lighttouched = true;
5550	5937	} // all panes...
	5938	+
5551	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5552	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5553	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5675,6 +6063,7 @@
5675	6063	if (GetBRep() != null)
5676	6064	{
5677	6065	display.NextIndex();
	6066	+
5678	6067	// vertex color conflict : gl.glCallList(list);
5679	6068	DrawNode(display, root, selected);
5680	6069	if (this instanceof BezierPatch)
..	..	@@ -5715,16 +6104,27 @@
5715	6104	tex = GetTextures();
5716	6105	}
5717	6106
5718		- boolean failed = false;
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
5719	6109
5720	6110	try
5721	6111	{
5722		- display.BindTextures(tex, texres);
	6112	+ display.BindPigmentTexture(tex, texres);
5723	6113	}
5724	6114	catch (Exception e)
5725	6115	{
5726	6116	System.err.println("FAILED: " + this);
5727		- failed = true;
	6117	+ failedPigment = true;
	6118	+ }
	6119	+
	6120	+ try
	6121	+ {
	6122	+ display.BindBumpTexture(tex, texres);
	6123	+ }
	6124	+ catch (Exception e)
	6125	+ {
	6126	+ //System.err.println("FAILED: " + this);
	6127	+ failedBump = true;
5728	6128	}
5729	6129
5730	6130	if (!compiled)
..	..	@@ -5747,8 +6147,11 @@
5747	6147	}
5748	6148	}
5749	6149
5750		- if (!failed)
5751		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5752	6155
5753	6156	display.PopMaterial(this, selected);
5754	6157	}
..	..	@@ -6121,6 +6524,11 @@
6121	6524	// dec 2012
6122	6525	new Exception().printStackTrace();
6123	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6124	6532	}
6125	6533
6126	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6906,20 +7314,23 @@
6906	7314	}
6907	7315	}
6908	7316
6909		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7317	+ static ClickInfo clickInfo = new ClickInfo();
	7318	+
	7319	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7320	+ Point outPt, Rectangle outRec)
6910	7321	{
6911		- int hc = info.bounds.x + info.bounds.width / 2;
6912		- int vc = info.bounds.y + info.bounds.height / 2;
6913		- double[][] toscreen = info.toScreen;
	7322	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7323	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7324	+ double[][] toscreen = clickInfo.toScreen;
6914	7325	if (toscreen == null)
6915	7326	{
6916		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6917	7328	}
6918	7329	cVector vec = in;
6919	7330	LA.xformPos(in, toscreen, in);
6920	7331	//System.out.println("Distance = " + info.camera.Distance());
6921		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6922		- vec.y = 100 info.camera.SCALE / info.camera.Distance();
	7332	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7333	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6923	7334	outPt.x = hc + (int) vec.x;
6924	7335	outPt.y = vc - (int) vec.y;
6925	7336	outRec.x = outPt.x - 3;
..	..	@@ -6927,15 +7338,18 @@
6927	7338	outRec.width = outRec.height = 6;
6928	7339	}
6929	7340
6930		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6931	7343	{
6932	7344	Point pt = new Point(0, 0);
6933	7345	Rectangle rec = new Rectangle();
6934		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6935	7348	return rec;
6936	7349	}
6937	7350
6938		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6939	7353	{
6940	7354	if (level == 0)
6941	7355	{
..	..	@@ -6944,16 +7358,19 @@
6944	7358	{
6945	7359	cVector origin = new cVector();
6946	7360	//LA.xformPos(origin, toParent, origin);
6947		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
6948	7365	Rectangle boundary = new Rectangle();
6949	7366	boundary.x = spot.x - 30;
6950	7367	boundary.y = spot.y - 30;
6951	7368	boundary.width = spot.width + 60;
6952	7369	boundary.height = spot.height + 60;
6953		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
6954	7371	int spotw = spot.x + spot.width;
6955	7372	int spoth = spot.y + spot.height;
6956		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6957	7374	// if (CameraPane.Xmin > spot.x)
6958	7375	// {
6959	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -6973,8 +7390,8 @@
6973	7390	spot.translate(32, 32);
6974	7391	spotw = spot.x + spot.width;
6975	7392	spoth = spot.y + spot.height;
6976		- info.g.setColor(Color.blue);
6977		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7393	+ clickInfo.g.setColor(Color.cyan);
	7394	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
6978	7395	// if (CameraPane.Xmin > spot.x)
6979	7396	// {
6980	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -6991,11 +7408,12 @@
6991	7408	// {
6992	7409	// CameraPane.Ymax = spoth;
6993	7410	// }
6994		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
6995		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7411	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7412	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
6996	7413	spot.translate(0, -32);
6997		- info.g.setColor(Color.green);
6998		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7414	+ clickInfo.g.setColor(Color.yellow);
	7415	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7416	+ clickInfo.g.setColor(Color.green);
6999	7417	// if (CameraPane.Xmin > spot.x)
7000	7418	// {
7001	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7012,8 +7430,8 @@
7012	7430	// {
7013	7431	// CameraPane.Ymax = spoth;
7014	7432	// }
7015		- info.g.drawArc(boundary.x, boundary.y,
7016		- boundary.width, boundary.height, 0, 360);
	7433	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7434	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7017	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7018	7436	// if (CameraPane.Xmin > boundary.x)
7019	7437	// {
..	..	@@ -7035,7 +7453,8 @@
7035	7453	}
7036	7454	}
7037	7455
7038		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7039	7458	{
7040	7459	if (level == 0)
7041	7460	{
..	..	@@ -7044,8 +7463,8 @@
7044	7463
7045	7464	boolean retval = false;
7046	7465
7047		- startX = info.x;
7048		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7049	7468
7050	7469	hitSomething = -1;
7051	7470	cVector origin = new cVector();
..	..	@@ -7055,22 +7474,51 @@
7055	7474	{
7056	7475	centerPt = new Point(0, 0);
7057	7476	}
7058		- calcHotSpot(origin, info, centerPt, spot);
7059		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7060	7480	{
7061	7481	hitSomething = hitCenter;
7062	7482	retval = true;
7063	7483	}
7064	7484	spot.translate(32, 0);
7065		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7066	7486	{
7067	7487	hitSomething = hitRotate;
7068	7488	retval = true;
7069	7489	}
7070	7490	spot.translate(0, 32);
7071		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7072	7492	{
7073	7493	hitSomething = hitScale;
	7494	+
	7495	+ double scale = 0.005f * clickInfo.camera.Distance();
	7496	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7497	+ double sign = 1;
	7498	+ if (hScale < 0)
	7499	+ {
	7500	+ sign = -1;
	7501	+ }
	7502	+ hScale = signMath.pow(signhScale, scale * 50);
	7503	+ if (hScale < 0.01)
	7504	+ {
	7505	+ //hScale = 0.01;
	7506	+ }
	7507	+
	7508	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7509	+ sign = 1;
	7510	+ if (vScale < 0)
	7511	+ {
	7512	+ sign = -1;
	7513	+ }
	7514	+ vScale = signMath.pow(signvScale, scale * 50);
	7515	+ if (vScale < 0.01)
	7516	+ {
	7517	+ //vScale = 0.01;
	7518	+ }
	7519	+
	7520	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7521	+
7074	7522	retval = true;
7075	7523	}
7076	7524
..	..	@@ -7080,7 +7528,7 @@
7080	7528	}
7081	7529
7082	7530	//System.out.println("info.modifiers = " + info.modifiers);
7083		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7084	7532	//System.out.println("modified = " + modified);
7085	7533	//new Exception().printStackTrace();
7086	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7108,7 +7556,8 @@
7108	7556	return true;
7109	7557	}
7110	7558
7111		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7112	7561	{
7113	7562	if (hitSomething == 0)
7114	7563	{
..	..	@@ -7122,7 +7571,7 @@
7122	7571
7123	7572	//System.out.println("hitSomething = " + hitSomething);
7124	7573
7125		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7126	7575
7127	7576	cVector xlate = new cVector();
7128	7577	//cVector xlate2 = new cVector();
..	..	@@ -7156,8 +7605,8 @@
7156	7605	toParent[3][i] = xlate.get(i);
7157	7606	LA.matInvert(toParent, fromParent);
7158	7607	*/
7159		- cVector delta = LA.newVector(0, 0, startY - info.y);
7160		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7608	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7609	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7161	7610
7162	7611	LA.matCopy(startMat, toParent);
7163	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7166,7 +7615,7 @@
7166	7615	} else
7167	7616	{
7168	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7169		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7170	7619	cVector away = new cVector();
7171	7620	//cVector right2 = new cVector();
7172	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7183,19 +7632,19 @@
7183	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7184	7633	// if (!CameraPane.LOCALTRANSFORM)
7185	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7186		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7187	7636	// if (!CameraPane.LOCALTRANSFORM)
7188	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7189	7638	//LA.vecCross(up, cVector.Z, right2);
7190	7639
7191		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7192	7641
7193	7642	//System.out.println("DELTA0 = " + delta);
7194	7643	//System.out.println("AWAY = " + info.camera.away);
7195	7644	//System.out.println("UP = " + info.camera.up);
7196	7645	if (away.z > 0)
7197	7646	{
7198		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7199	7648	{
7200	7649	delta.x = -delta.x;
7201	7650	} else
..	..	@@ -7210,7 +7659,7 @@
7210	7659	//System.out.println("DELTA1 = " + delta);
7211	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7212	7661	//System.out.println("DELTA2 = " + delta);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7663	LA.matCopy(startMat, toParent);
7215	7664	//System.out.println("DELTA3 = " + delta);
7216	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7220,8 +7669,8 @@
7220	7669	break;
7221	7670
7222	7671	case hitRotate: // rotate
7223		- int dx = info.x - centerPt.x;
7224		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7225	7674	double angle = (double) Math.atan2(dx, dy);
7226	7675	angle = -(1.570796 - angle);
7227	7676
..	..	@@ -7244,7 +7693,7 @@
7244	7693	}
7245	7694	/**/
7246	7695
7247		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7248	7697	{
7249	7698	case 1: // '\001'
7250	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7271,7 +7720,7 @@
7271	7720	break;
7272	7721
7273	7722	case hitScale: // scale
7274		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7275	7724	double sign = 1;
7276	7725	if (hScale < 0)
7277	7726	{
..	..	@@ -7283,7 +7732,7 @@
7283	7732	//hScale = 0.01;
7284	7733	}
7285	7734
7286		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7287	7736	sign = 1;
7288	7737	if (vScale < 0)
7289	7738	{
..	..	@@ -7294,6 +7743,7 @@
7294	7743	{
7295	7744	//vScale = 0.01;
7296	7745	}
	7746	+
7297	7747	LA.matCopy(startMat, toParent);
7298	7748	/**/
7299	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7303,29 +7753,30 @@
7303	7753	}
7304	7754	/**/
7305	7755
7306		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7307	7757
7308	7758	if (totalScale < 0.01)
7309	7759	{
7310	7760	totalScale = 0.01;
7311	7761	}
7312	7762
7313		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7314	7764	{
7315	7765	case 3: // '\001'
7316		- if (modified)
	7766	+ if (modified \|\| opposite)
7317	7767	{
7318	7768	//LA.matScale(toParent, 1, hScale, vScale);
7319	7769	LA.matScale(toParent, totalScale, 1, 1);
7320	7770	} // vScale, 1);
7321	7771	else
7322	7772	{
	7773	+ // EXCEPTION!
7323	7774	LA.matScale(toParent, totalScale, totalScale, totalScale);
7324	7775	} // vScale, 1);
7325	7776	break;
7326	7777
7327	7778	case 2: // '\002'
7328		- if (modified)
	7779	+ if (modified \|\| opposite)
7329	7780	{
7330	7781	//LA.matScale(toParent, hScale, 1, vScale);
7331	7782	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7336,7 +7787,7 @@
7336	7787	break;
7337	7788
7338	7789	case 1: // '\003'
7339		- if (modified)
	7790	+ if (modified \|\| opposite)
7340	7791	{
7341	7792	//LA.matScale(toParent, hScale, vScale, 1);
7342	7793	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7376,7 +7827,7 @@
7376	7827	} // NEW ...
7377	7828
7378	7829
7379		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7380	7831	}
7381	7832
7382	7833	boolean overflow = false;
..	..	@@ -7556,6 +8007,10 @@
7556	8007	editWindow = null;
7557	8008	} // ?
7558	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7559	8014	}
7560	8015
7561	8016	boolean root; // patch for edit windows
..	..	@@ -7567,7 +8022,7 @@
7567	8022	/transient/ cVector2[] projectedVertices = new cVector2[0];
7568	8023
7569	8024	Object3D /Composite/ parent;
7570		- Object3D /Composite/ fileparent;
	8025	+ Object3D /Composite/ fileparent; // In the case of FileObject
7571	8026
7572	8027	double[][] toParent; // dynamic matrix
7573	8028	double[][] fromParent;
..	..	@@ -7713,6 +8168,10 @@
7713	8168	}
7714	8169
7715	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7716	8175	transient ObjectUI objectUI;
7717	8176	public static int povDepth = 0;
7718	8177	private static cVector tbMin = new cVector();