~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,117 +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		-
166		-void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
167		-{
168		- if (hashtable.containsKey(GetUUID()))
169		- return;
170		-
171		- Object3D o = new Object3D();
172		- o.bRep = this.bRep;
173		- if (this.bRep != null)
174		- {
175		- o.transientrep = this.bRep.support;
176		- o.bRep.support = null;
177		- }
178		-
179		-// o.support = this.support;
180		-// o.fileparent = this.fileparent;
181		-// if (this.bRep != null)
182		-// o.bRep = this.bRep.support;
183		-
184		- hashtable.put(GetUUID(), o);
185		-
186		- this.bRep = null;
187		-// if (this.bRep != null)
188		-// this.bRep.support = null;
189		-// this.support = null;
190		-// this.fileparent = null;
191		-
192		- for (int i=0; i<Size(); i++)
193		- {
194		- get(i).ExtractBigData(hashtable);
195		- }
196		-}
197		-
198		-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
199		-{
200		- if (!hashtable.containsKey(GetUUID()))
201		- return;
202		-
203		- Object3D o = hashtable.get(GetUUID());
204		-
205		- this.bRep = o.bRep;
206		- if (this.bRep != null)
207		- this.bRep.support = o.transientrep;
208		-// this.support = o.support;
209		-// this.fileparent = o.fileparent;
210		-
211		- hashtable.remove(GetUUID());
212		-
213		- for (int i=0; i<Size(); i++)
214		- {
215		- get(i).RestoreBigData(hashtable);
216		- }
217		-}
218	290
219	291	// MOCAP SUPPORT
220	292	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +429,7 @@
357	429	}
358	430
359	431	boolean live = false;
	432	+ transient boolean keepdontselect;
360	433	boolean dontselect = false;
361	434	boolean hide = false;
362	435	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +612,14 @@
539	612	toParent = LA.newMatrix();
540	613	fromParent = LA.newMatrix();
541	614	}
	615	+
542	616	if (toParentMarked == null)
543	617	{
544	618	if (maxcount != 1)
545	619	{
546	620	new Exception().printStackTrace();
547	621	}
	622	+
548	623	toParentMarked = LA.newMatrix();
549	624	fromParentMarked = LA.newMatrix();
550	625	}
..	..	@@ -855,7 +930,7 @@
855	930
856	931	if (marked && Globals.isLIVE() && live &&
857	932	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	933	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	934	currentframe != Globals.framecount)
860	935	{
861	936	currentframe = Globals.framecount;
..	..	@@ -867,7 +942,8 @@
867	942
868	943	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	944
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	945	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	946	+ (step == 1 && changedir))
871	947	{
872	948	countdown = 1;
873	949	delay = speedup?8:1;
..	..	@@ -939,6 +1015,7 @@
939	1015	if (material == null \|\| material.multiply)
940	1016	return true;
941	1017
	1018	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1019	return material.opacity > 0.99;
943	1020	}
944	1021
..	..	@@ -1339,6 +1416,7 @@
1339	1416	toParent = LA.newMatrix();
1340	1417	fromParent = LA.newMatrix();
1341	1418	}
	1419	+
1342	1420	LA.matCopy(other.toParent, toParent);
1343	1421	LA.matCopy(other.fromParent, fromParent);
1344	1422
..	..	@@ -2360,6 +2438,10 @@
2360	2438	}
2361	2439	*/
2362	2440	}
	2441	+ else
	2442	+ {
	2443	+ //((ObjEditor)editWindow).SetupUI2(null);
	2444	+ }
2363	2445	}
2364	2446
2365	2447	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2483,14 @@
2401	2483	{
2402	2484	editWindow.refreshContents();
2403	2485	}
	2486	+ else
	2487	+ {
	2488	+ if (manipWindow != null)
	2489	+ {
	2490	+ manipWindow.refreshContents();
	2491	+ }
	2492	+ }
	2493	+
2404	2494	//if (parent != null)
2405	2495	//parent.refreshEditWindow();
2406	2496	}
..	..	@@ -2480,7 +2570,8 @@
2480	2570	private static final int editSelf = 1;
2481	2571	private static final int editChild = 2;
2482	2572
2483		- void drawEditHandles(ClickInfo info, int level)
	2573	+ void drawEditHandles(//ClickInfo info,
	2574	+ int level)
2484	2575	{
2485	2576	if (level == 0)
2486	2577	{
..	..	@@ -2488,7 +2579,8 @@
2488	2579	return;
2489	2580
2490	2581	Object3D selectee;
2491		- 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))
2492	2584	{
2493	2585	selectee = (Object3D) e.nextElement();
2494	2586	}
..	..	@@ -2496,19 +2588,22 @@
2496	2588	} else
2497	2589	{
2498	2590	//super.
2499		- drawEditHandles0(info, level + 1);
	2591	+ drawEditHandles0(//info,
	2592	+ level + 1);
2500	2593	}
2501	2594	}
2502	2595
2503		- boolean doEditClick(ClickInfo info, int level)
	2596	+ boolean doEditClick(//ClickInfo info,
	2597	+ int level)
2504	2598	{
2505	2599	doSomething = 0;
2506	2600	if (level == 0)
2507	2601	{
2508		- return doParentClick(info);
	2602	+ return doParentClick(); //info);
2509	2603	}
2510	2604	if (//super.
2511		- doEditClick0(info, level))
	2605	+ doEditClick0(//info,
	2606	+ level))
2512	2607	{
2513	2608	doSomething = 1;
2514	2609	return true;
..	..	@@ -2518,7 +2613,7 @@
2518	2613	}
2519	2614	}
2520	2615
2521		- boolean doParentClick(ClickInfo info)
	2616	+ boolean doParentClick() //ClickInfo info)
2522	2617	{
2523	2618	if (selection == null)
2524	2619	{
..	..	@@ -2531,7 +2626,8 @@
2531	2626	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2627	{
2533	2628	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2629	+ if (selectee.doEditClick(//info,
	2630	+ 1))
2535	2631	{
2536	2632	childToDrag = selectee;
2537	2633	doSomething = 2;
..	..	@@ -2543,13 +2639,15 @@
2543	2639	return retval;
2544	2640	}
2545	2641
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2642	+ void doEditDrag(//ClickInfo clickInfo,
	2643	+ boolean opposite)
2547	2644	{
2548	2645	switch (doSomething)
2549	2646	{
2550	2647	case 1: // '\001'
2551	2648	//super.
2552		- doEditDrag0(info, opposite);
	2649	+ doEditDrag0(//clickInfo,
	2650	+ opposite);
2553	2651	break;
2554	2652
2555	2653	case 2: // '\002'
..	..	@@ -2562,11 +2660,13 @@
2562	2660	{
2563	2661	//sel.hitSomething = childToDrag.hitSomething;
2564	2662	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2663	+ sel.doEditDrag(//clickInfo,
	2664	+ opposite);
2566	2665	} else
2567	2666	{
2568	2667	//super.
2569		- doEditDrag0(info, opposite);
	2668	+ doEditDrag0(//clickInfo,
	2669	+ opposite);
2570	2670	}
2571	2671	}
2572	2672	break;
..	..	@@ -2584,6 +2684,9 @@
2584	2684	{
2585	2685	deselectAll();
2586	2686	}
	2687	+
	2688	+ new Exception().printStackTrace();
	2689	+
2587	2690	ClickInfo newInfo = new ClickInfo();
2588	2691	newInfo.flags = info.flags;
2589	2692	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2779,18 @@
2676	2779	void GenNormalsS(boolean crease)
2677	2780	{
2678	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();
2679	2794	// for (int i=0; i<selection.size(); i++)
2680	2795	// {
2681	2796	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +2931,24 @@
2816	2931	if (child == null)
2817	2932	continue;
2818	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();
2819	2952	// Children().release(i);
2820	2953	}
2821	2954	blockloop = false;
..	..	@@ -2988,11 +3121,20 @@
2988	3121	}
2989	3122	}
2990	3123
	3124	+ void GenNormalsMesh0()
	3125	+ {
	3126	+ if (bRep != null)
	3127	+ {
	3128	+ bRep.GenerateNormalsMesh();
	3129	+ Touch();
	3130	+ }
	3131	+ }
	3132	+
2991	3133	void GenNormalsMINE0()
2992	3134	{
2993	3135	if (bRep != null)
2994	3136	{
2995		- bRep.GenerateNormalsMINE();
	3137	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3138	Touch();
2997	3139	}
2998	3140	}
..	..	@@ -3438,7 +3580,8 @@
3438	3580	if (blockloop)
3439	3581	return;
3440	3582
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3583	+ if (//marked \|\| // does not make sense
	3584	+ (bRep != null \|\| material != null)) // borderline...
3442	3585	live = h;
3443	3586
3444	3587	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3602,8 @@
3459	3602	return;
3460	3603
3461	3604	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3605	+ if (//marked \|\| // does not make sense
	3606	+ (bRep != null \|\| material != null)) // borderline...
3463	3607	link2master = h;
3464	3608
3465	3609	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3623,8 @@
3479	3623	if (blockloop)
3480	3624	return;
3481	3625
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3626	+ if (//marked \|\| // does not make sense
	3627	+ (bRep != null \|\| material != null)) // borderline...
3483	3628	hide = h;
3484	3629
3485	3630	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3644,7 @@
3499	3644	if (blockloop)
3500	3645	return;
3501	3646
3502		- if (bRep != null && material != null) // borderline...
	3647	+ if (bRep != null \|\| material != null) // borderline...
3503	3648	marked = h;
3504	3649
3505	3650	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3654,46 @@
3509	3654	continue;
3510	3655	blockloop = true;
3511	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);
3512	3697	blockloop = false;
3513	3698	// release(i);
3514	3699	}
..	..	@@ -4286,6 +4471,55 @@
4286	4471	}
4287	4472	}
4288	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	+
4289	4523	void RepairTexture()
4290	4524	{
4291	4525	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5034,14 @@
4800	5034	}
4801	5035	}
4802	5036
	5037	+ ObjEditor GetWindow()
	5038	+ {
	5039	+ if (editWindow != null)
	5040	+ return editWindow;
	5041	+
	5042	+ return manipWindow;
	5043	+ }
	5044	+
4803	5045	cTreePath Select(int indexcount, boolean deselect)
4804	5046	{
4805	5047	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5078,11 @@
4836	5078	if (leaf != null)
4837	5079	{
4838	5080	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5081	+ ObjEditor window = GetWindow();
	5082	+ if (window != null)
4840	5083	{
4841	5084	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5085	+ window.Select(tp, deselect, true);
4843	5086	}
4844	5087
4845	5088	return tp;
..	..	@@ -4856,6 +5099,7 @@
4856	5099
4857	5100	if (child == null)
4858	5101	continue;
	5102	+
4859	5103	if (child.HasTransparency() && child.size() != 0)
4860	5104	{
4861	5105	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5109,10 @@
4865	5109	if (leaf != null)
4866	5110	{
4867	5111	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5112	+ ObjEditor window = GetWindow();
	5113	+ if (window != null)
4869	5114	{
4870		- editWindow.Select(tp, deselect, true);
	5115	+ window.Select(tp, deselect, true);
4871	5116	}
4872	5117
4873	5118	return tp;
..	..	@@ -5192,6 +5437,51 @@
5192	5437	blockloop = false;
5193	5438	}
5194	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	+
5195	5485	boolean IsSelected()
5196	5486	{
5197	5487	if (parent == null)
..	..	@@ -5501,6 +5791,38 @@
5501	5791	}
5502	5792	}
5503	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	+
5504	5826	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5827	{
5506	5828	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5831,23 @@
5509	5831	boolean NeedSupport()
5510	5832	{
5511	5833	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5834	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5835	// PROBLEM with CROWD!!
5514	5836	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5837	}
5516	5838
5517	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	+ }
5518	5851
5519	5852	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5853	{
..	..	@@ -5577,7 +5910,7 @@
5577	5910	support = support;
5578	5911
5579	5912	//boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null \|\| !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5580		- 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);
5581	5914
5582	5915	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5916	{
..	..	@@ -5597,10 +5930,12 @@
5597	5930	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5931
5599	5932	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (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)))
5601	5935	{
5602	5936	Globals.lighttouched = true;
5603	5937	} // all panes...
	5938	+
5604	5939	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5940	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5941	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5728,6 +6063,7 @@
5728	6063	if (GetBRep() != null)
5729	6064	{
5730	6065	display.NextIndex();
	6066	+
5731	6067	// vertex color conflict : gl.glCallList(list);
5732	6068	DrawNode(display, root, selected);
5733	6069	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6104,27 @@
5768	6104	tex = GetTextures();
5769	6105	}
5770	6106
5771		- boolean failed = false;
	6107	+ boolean failedPigment = false;
	6108	+ boolean failedBump = false;
5772	6109
5773	6110	try
5774	6111	{
5775		- display.BindTextures(tex, texres);
	6112	+ display.BindPigmentTexture(tex, texres);
5776	6113	}
5777	6114	catch (Exception e)
5778	6115	{
5779	6116	System.err.println("FAILED: " + this);
5780		- 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;
5781	6128	}
5782	6129
5783	6130	if (!compiled)
..	..	@@ -5800,8 +6147,11 @@
5800	6147	}
5801	6148	}
5802	6149
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6150	+ if (!failedBump)
	6151	+ display.ReleaseBumpTexture(tex);
	6152	+
	6153	+ if (!failedPigment)
	6154	+ display.ReleasePigmentTexture(tex);
5805	6155
5806	6156	display.PopMaterial(this, selected);
5807	6157	}
..	..	@@ -6174,6 +6524,11 @@
6174	6524	// dec 2012
6175	6525	new Exception().printStackTrace();
6176	6526	return;
	6527	+ }
	6528	+
	6529	+ if (dontselect)
	6530	+ {
	6531	+ //bRep.GenerateNormalsMINE();
6177	6532	}
6178	6533
6179	6534	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6959,20 +7314,23 @@
6959	7314	}
6960	7315	}
6961	7316
6962		- 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)
6963	7321	{
6964		- int hc = info.bounds.x + info.bounds.width / 2;
6965		- int vc = info.bounds.y + info.bounds.height / 2;
6966		- 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;
6967	7325	if (toscreen == null)
6968	7326	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7327	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7328	}
6971	7329	cVector vec = in;
6972	7330	LA.xformPos(in, toscreen, in);
6973	7331	//System.out.println("Distance = " + info.camera.Distance());
6974		- vec.x = 100 info.camera.SCALE / info.camera.Distance();
6975		- 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();
6976	7334	outPt.x = hc + (int) vec.x;
6977	7335	outPt.y = vc - (int) vec.y;
6978	7336	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7338,18 @@
6980	7338	outRec.width = outRec.height = 6;
6981	7339	}
6982	7340
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7341	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7342	+ )
6984	7343	{
6985	7344	Point pt = new Point(0, 0);
6986	7345	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7346	+ calcHotSpot(in, //clickInfo,
	7347	+ pt, rec);
6988	7348	return rec;
6989	7349	}
6990	7350
6991		- void drawEditHandles0(ClickInfo info, int level)
	7351	+ void drawEditHandles0(//ClickInfo clickInfo,
	7352	+ int level)
6992	7353	{
6993	7354	if (level == 0)
6994	7355	{
..	..	@@ -6997,16 +7358,19 @@
6997	7358	{
6998	7359	cVector origin = new cVector();
6999	7360	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7361	+ if (this.clickInfo == null)
	7362	+ this.clickInfo = new ClickInfo();
	7363	+
	7364	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7365	Rectangle boundary = new Rectangle();
7002	7366	boundary.x = spot.x - 30;
7003	7367	boundary.y = spot.y - 30;
7004	7368	boundary.width = spot.width + 60;
7005	7369	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7370	+ clickInfo.g.setColor(Color.red);
7007	7371	int spotw = spot.x + spot.width;
7008	7372	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7373	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7374	// if (CameraPane.Xmin > spot.x)
7011	7375	// {
7012	7376	// CameraPane.Xmin = spot.x;
..	..	@@ -7026,8 +7390,8 @@
7026	7390	spot.translate(32, 32);
7027	7391	spotw = spot.x + spot.width;
7028	7392	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- 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);
7031	7395	// if (CameraPane.Xmin > spot.x)
7032	7396	// {
7033	7397	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,11 +7408,12 @@
7044	7408	// {
7045	7409	// CameraPane.Ymax = spoth;
7046	7410	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //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
7049	7413	spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
7051		- 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);
7052	7417	// if (CameraPane.Xmin > spot.x)
7053	7418	// {
7054	7419	// CameraPane.Xmin = spot.x;
..	..	@@ -7065,8 +7430,8 @@
7065	7430	// {
7066	7431	// CameraPane.Ymax = spoth;
7067	7432	// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- 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);
7070	7435	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7436	// if (CameraPane.Xmin > boundary.x)
7072	7437	// {
..	..	@@ -7088,7 +7453,8 @@
7088	7453	}
7089	7454	}
7090	7455
7091		- boolean doEditClick0(ClickInfo info, int level)
	7456	+ boolean doEditClick0(//ClickInfo clickInfo,
	7457	+ int level)
7092	7458	{
7093	7459	if (level == 0)
7094	7460	{
..	..	@@ -7097,8 +7463,8 @@
7097	7463
7098	7464	boolean retval = false;
7099	7465
7100		- startX = info.x;
7101		- startY = info.y;
	7466	+ startX = clickInfo.x;
	7467	+ startY = clickInfo.y;
7102	7468
7103	7469	hitSomething = -1;
7104	7470	cVector origin = new cVector();
..	..	@@ -7108,22 +7474,51 @@
7108	7474	{
7109	7475	centerPt = new Point(0, 0);
7110	7476	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7477	+ calcHotSpot(origin, //info,
	7478	+ centerPt, spot);
	7479	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7480	{
7114	7481	hitSomething = hitCenter;
7115	7482	retval = true;
7116	7483	}
7117	7484	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7485	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7486	{
7120	7487	hitSomething = hitRotate;
7121	7488	retval = true;
7122	7489	}
7123	7490	spot.translate(0, 32);
7124		- if (spot.contains(info.x, info.y))
	7491	+ if (spot.contains(clickInfo.x, clickInfo.y))
7125	7492	{
7126	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	+
7127	7522	retval = true;
7128	7523	}
7129	7524
..	..	@@ -7133,7 +7528,7 @@
7133	7528	}
7134	7529
7135	7530	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7531	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7532	//System.out.println("modified = " + modified);
7138	7533	//new Exception().printStackTrace();
7139	7534	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7556,8 @@
7161	7556	return true;
7162	7557	}
7163	7558
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7559	+ void doEditDrag0(//ClickInfo info,
	7560	+ boolean opposite)
7165	7561	{
7166	7562	if (hitSomething == 0)
7167	7563	{
..	..	@@ -7175,7 +7571,7 @@
7175	7571
7176	7572	//System.out.println("hitSomething = " + hitSomething);
7177	7573
7178		- double scale = 0.005f * info.camera.Distance();
	7574	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7575
7180	7576	cVector xlate = new cVector();
7181	7577	//cVector xlate2 = new cVector();
..	..	@@ -7209,8 +7605,8 @@
7209	7605	toParent[3][i] = xlate.get(i);
7210	7606	LA.matInvert(toParent, fromParent);
7211	7607	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- 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);
7214	7610
7215	7611	LA.matCopy(startMat, toParent);
7216	7612	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +7615,7 @@
7219	7615	} else
7220	7616	{
7221	7617	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	7618	+ cVector up = new cVector(clickInfo.camera.up);
7223	7619	cVector away = new cVector();
7224	7620	//cVector right2 = new cVector();
7225	7621	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +7632,19 @@
7236	7632	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	7633	// if (!CameraPane.LOCALTRANSFORM)
7238	7634	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7635	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	7636	// if (!CameraPane.LOCALTRANSFORM)
7241	7637	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	7638	//LA.vecCross(up, cVector.Z, right2);
7243	7639
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7640	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	7641
7246	7642	//System.out.println("DELTA0 = " + delta);
7247	7643	//System.out.println("AWAY = " + info.camera.away);
7248	7644	//System.out.println("UP = " + info.camera.up);
7249	7645	if (away.z > 0)
7250	7646	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7647	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	7648	{
7253	7649	delta.x = -delta.x;
7254	7650	} else
..	..	@@ -7263,7 +7659,7 @@
7263	7659	//System.out.println("DELTA1 = " + delta);
7264	7660	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	7661	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7662	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	7663	LA.matCopy(startMat, toParent);
7268	7664	//System.out.println("DELTA3 = " + delta);
7269	7665	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +7669,8 @@
7273	7669	break;
7274	7670
7275	7671	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	7672	+ int dx = clickInfo.x - centerPt.x;
	7673	+ int dy = -(clickInfo.y - centerPt.y);
7278	7674	double angle = (double) Math.atan2(dx, dy);
7279	7675	angle = -(1.570796 - angle);
7280	7676
..	..	@@ -7297,7 +7693,7 @@
7297	7693	}
7298	7694	/**/
7299	7695
7300		- switch (info.pane.RenderCamera().viewCode)
	7696	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	7697	{
7302	7698	case 1: // '\001'
7303	7699	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +7720,7 @@
7324	7720	break;
7325	7721
7326	7722	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	7723	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7328	7724	double sign = 1;
7329	7725	if (hScale < 0)
7330	7726	{
..	..	@@ -7336,7 +7732,7 @@
7336	7732	//hScale = 0.01;
7337	7733	}
7338	7734
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	7735	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7340	7736	sign = 1;
7341	7737	if (vScale < 0)
7342	7738	{
..	..	@@ -7347,6 +7743,7 @@
7347	7743	{
7348	7744	//vScale = 0.01;
7349	7745	}
	7746	+
7350	7747	LA.matCopy(startMat, toParent);
7351	7748	/**/
7352	7749	for (int i = 0; i < 3; i++)
..	..	@@ -7356,29 +7753,30 @@
7356	7753	}
7357	7754	/**/
7358	7755
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7756	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	7757
7361	7758	if (totalScale < 0.01)
7362	7759	{
7363	7760	totalScale = 0.01;
7364	7761	}
7365	7762
7366		- switch (info.pane.RenderCamera().viewCode)
	7763	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	7764	{
7368	7765	case 3: // '\001'
7369		- if (modified)
	7766	+ if (modified \|\| opposite)
7370	7767	{
7371	7768	//LA.matScale(toParent, 1, hScale, vScale);
7372	7769	LA.matScale(toParent, totalScale, 1, 1);
7373	7770	} // vScale, 1);
7374	7771	else
7375	7772	{
	7773	+ // EXCEPTION!
7376	7774	LA.matScale(toParent, totalScale, totalScale, totalScale);
7377	7775	} // vScale, 1);
7378	7776	break;
7379	7777
7380	7778	case 2: // '\002'
7381		- if (modified)
	7779	+ if (modified \|\| opposite)
7382	7780	{
7383	7781	//LA.matScale(toParent, hScale, 1, vScale);
7384	7782	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7389,7 +7787,7 @@
7389	7787	break;
7390	7788
7391	7789	case 1: // '\003'
7392		- if (modified)
	7790	+ if (modified \|\| opposite)
7393	7791	{
7394	7792	//LA.matScale(toParent, hScale, vScale, 1);
7395	7793	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7429,7 +7827,7 @@
7429	7827	} // NEW ...
7430	7828
7431	7829
7432		- info.pane.repaint();
	7830	+ clickInfo.pane.repaint();
7433	7831	}
7434	7832
7435	7833	boolean overflow = false;
..	..	@@ -7609,6 +8007,10 @@
7609	8007	editWindow = null;
7610	8008	} // ?
7611	8009	}
	8010	+ else
	8011	+ {
	8012	+ //editWindow.closeUI();
	8013	+ }
7612	8014	}
7613	8015
7614	8016	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8168,10 @@
7766	8168	}
7767	8169
7768	8170	transient ObjEditor editWindow;
	8171	+ transient ObjEditor manipWindow;
	8172	+
	8173	+ transient boolean pinned;
	8174	+
7769	8175	transient ObjectUI objectUI;
7770	8176	public static int povDepth = 0;
7771	8177	private static cVector tbMin = new cVector();