~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -24,6 +24,14 @@
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	+ byte[] versions[];
	33	+ int versionindex = -1;
	34	+
27	35	ScriptNode scriptnode;
28	36
29	37	void InitOthers()
..	..	@@ -104,117 +112,178 @@
104	112
105	113	// transient boolean reduced; // for morph reduction
106	114
107		-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108		-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
	115	+ transient com.bulletphysics.linearmath.Transform cache; // for fast merge
	116	+ transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109	117
110		-transient Object3D transientsupport; // for cloning
111		-transient boolean transientlink2master;
	118	+ transient Object3D transientsupport; // for cloning
	119	+ transient boolean transientlink2master;
112	120
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)
	121	+ void SaveSupports()
125	122	{
126		- bRep.SaveSupports();
	123	+ if (blockloop)
	124	+ return;
	125	+
	126	+ transientsupport = support;
	127	+ transientlink2master = link2master;
	128	+
	129	+ support = null;
	130	+ link2master = false;
	131	+
	132	+ if (bRep != null)
	133	+ {
	134	+ bRep.SaveSupports();
	135	+ }
	136	+
	137	+ for (int i = 0; i < Size(); i++)
	138	+ {
	139	+ Object3D child = (Object3D) get(i);
	140	+ if (child == null)
	141	+ continue;
	142	+ blockloop = true;
	143	+ child.SaveSupports();
	144	+ blockloop = false;
	145	+ }
127	146	}
128		-
129		- for (int i = 0; i < Size(); i++)
	147	+
	148	+ void RestoreSupports()
130	149	{
131		- Object3D child = (Object3D) get(i);
132		- if (child == null)
133		- continue;
	150	+ if (blockloop)
	151	+ return;
	152	+
	153	+ support = transientsupport;
	154	+ link2master = transientlink2master;
	155	+ transientsupport = null;
	156	+ transientlink2master = false;
	157	+
	158	+ if (bRep != null)
	159	+ {
	160	+ bRep.RestoreSupports();
	161	+ }
	162	+
	163	+ for (int i = 0; i < Size(); i++)
	164	+ {
	165	+ Object3D child = (Object3D) get(i);
	166	+ if (child == null)
	167	+ continue;
	168	+ blockloop = true;
	169	+ child.RestoreSupports();
	170	+ blockloop = false;
	171	+ }
	172	+ }
	173	+
	174	+ void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	175	+ {
	176	+ Object3D o;
	177	+
	178	+ if (hashtable.containsKey(GetUUID()))
	179	+ {
	180	+ o = hashtable.get(GetUUID());
	181	+
	182	+ Grafreed.Assert(this.bRep == o.bRep);
	183	+ //if (this.bRep != null)
	184	+ // assert(this.bRep.support == o.transientrep);
	185	+ if (this.support != null)
	186	+ assert(this.support.bRep == o.transientrep);
	187	+ }
	188	+ else
	189	+ {
	190	+ o = new Object3D("copy of " + this.name);
	191	+
	192	+ hashtable.put(GetUUID(), o);
	193	+ }
	194	+
	195	+ if (!blockloop)
	196	+ {
	197	+ blockloop = true;
	198	+
	199	+ for (int i=0; i<Size(); i++)
	200	+ {
	201	+ get(i).ExtractBigData(hashtable);
	202	+ }
	203	+
	204	+ blockloop = false;
	205	+ }
	206	+
	207	+ ExtractBigData(o);
	208	+ }
	209	+
	210	+ void ExtractBigData(Object3D o)
	211	+ {
	212	+ if (o.bRep != null)
	213	+ Grafreed.Assert(o.bRep == this.bRep);
	214	+
	215	+ o.bRep = this.bRep;
	216	+// July 2019 if (this.bRep != null)
	217	+// {
	218	+// o.transientrep = this.bRep.support;
	219	+// o.bRep.support = null;
	220	+// }
	221	+ o.selection = this.selection;
	222	+ o.versions = this.versions;
	223	+ o.versionindex = this.versionindex;
	224	+
	225	+ if (this.support != null)
	226	+ {
	227	+ if (o.transientrep != null)
	228	+ Grafreed.Assert(o.transientrep == this.support.bRep);
	229	+
	230	+ o.transientrep = this.support.bRep;
	231	+ this.support.bRep = null;
	232	+ }
	233	+
	234	+ // o.support = this.support;
	235	+ // o.fileparent = this.fileparent;
	236	+ // if (this.bRep != null)
	237	+ // o.bRep = this.bRep.support;
	238	+
	239	+ this.bRep = null;
	240	+ // if (this.bRep != null)
	241	+ // this.bRep.support = null;
	242	+ // this.support = null;
	243	+ // this.fileparent = null;
	244	+ }
	245	+
	246	+ void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
	247	+ {
	248	+ if (!hashtable.containsKey(GetUUID()))
	249	+ return;
	250	+
	251	+ Object3D o = hashtable.get(GetUUID());
	252	+
	253	+ RestoreBigData(o);
	254	+
	255	+ if (blockloop)
	256	+ return;
	257	+
134	258	blockloop = true;
135		- child.SaveSupports();
	259	+
	260	+ //hashtable.remove(GetUUID());
	261	+
	262	+ for (int i=0; i<Size(); i++)
	263	+ {
	264	+ get(i).RestoreBigData(hashtable);
	265	+ }
	266	+
136	267	blockloop = false;
137	268	}
138		-}
139	269
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)
	270	+ void RestoreBigData(Object3D o)
151	271	{
152		- bRep.RestoreSupports();
	272	+ this.bRep = o.bRep;
	273	+ if (this.support != null && o.transientrep != null)
	274	+ {
	275	+ this.support.bRep = o.transientrep;
	276	+ }
	277	+
	278	+ this.selection = o.selection;
	279	+
	280	+ this.versions = o.versions;
	281	+ this.versionindex = o.versionindex;
	282	+// July 2019 if (this.bRep != null)
	283	+// this.bRep.support = o.transientrep;
	284	+ // this.support = o.support;
	285	+ // this.fileparent = o.fileparent;
153	286	}
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	287
219	288	// MOCAP SUPPORT
220	289	double tx,ty,tz,rx,ry,rz;
..	..	@@ -357,6 +426,7 @@
357	426	}
358	427
359	428	boolean live = false;
	429	+ transient boolean keepdontselect;
360	430	boolean dontselect = false;
361	431	boolean hide = false;
362	432	boolean link2master = false; // performs reset support/master at each frame
..	..	@@ -539,12 +609,14 @@
539	609	toParent = LA.newMatrix();
540	610	fromParent = LA.newMatrix();
541	611	}
	612	+
542	613	if (toParentMarked == null)
543	614	{
544	615	if (maxcount != 1)
545	616	{
546	617	new Exception().printStackTrace();
547	618	}
	619	+
548	620	toParentMarked = LA.newMatrix();
549	621	fromParentMarked = LA.newMatrix();
550	622	}
..	..	@@ -855,7 +927,7 @@
855	927
856	928	if (marked && Globals.isLIVE() && live &&
857	929	//TEMP21aug2018
858		- (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW) &&
	930	+ (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| !Globals.COMPUTESHADOWWHENLIVE) &&
859	931	currentframe != Globals.framecount)
860	932	{
861	933	currentframe = Globals.framecount;
..	..	@@ -867,7 +939,8 @@
867	939
868	940	boolean changedir = random && Math.random() < 0.01; // && !link2master;
869	941
870		- if (transformcount*factor > maxcount \|\| (step == 1 && changedir))
	942	+ if (transformcount*factor >= maxcount && (rewind \|\| random) \|\|
	943	+ (step == 1 && changedir))
871	944	{
872	945	countdown = 1;
873	946	delay = speedup?8:1;
..	..	@@ -939,6 +1012,7 @@
939	1012	if (material == null \|\| material.multiply)
940	1013	return true;
941	1014
	1015	+ // Transparent objects are dynamic because we have to sort the triangles.
942	1016	return material.opacity > 0.99;
943	1017	}
944	1018
..	..	@@ -1339,6 +1413,7 @@
1339	1413	toParent = LA.newMatrix();
1340	1414	fromParent = LA.newMatrix();
1341	1415	}
	1416	+
1342	1417	LA.matCopy(other.toParent, toParent);
1343	1418	LA.matCopy(other.fromParent, fromParent);
1344	1419
..	..	@@ -2360,6 +2435,10 @@
2360	2435	}
2361	2436	*/
2362	2437	}
	2438	+ else
	2439	+ {
	2440	+ //((ObjEditor)editWindow).SetupUI2(null);
	2441	+ }
2363	2442	}
2364	2443
2365	2444	void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..	..	@@ -2401,6 +2480,14 @@
2401	2480	{
2402	2481	editWindow.refreshContents();
2403	2482	}
	2483	+ else
	2484	+ {
	2485	+ if (manipWindow != null)
	2486	+ {
	2487	+ manipWindow.refreshContents();
	2488	+ }
	2489	+ }
	2490	+
2404	2491	//if (parent != null)
2405	2492	//parent.refreshEditWindow();
2406	2493	}
..	..	@@ -2480,7 +2567,8 @@
2480	2567	private static final int editSelf = 1;
2481	2568	private static final int editChild = 2;
2482	2569
2483		- void drawEditHandles(ClickInfo info, int level)
	2570	+ void drawEditHandles(//ClickInfo info,
	2571	+ int level)
2484	2572	{
2485	2573	if (level == 0)
2486	2574	{
..	..	@@ -2488,7 +2576,8 @@
2488	2576	return;
2489	2577
2490	2578	Object3D selectee;
2491		- for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
	2579	+ for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
	2580	+ level + 1))
2492	2581	{
2493	2582	selectee = (Object3D) e.nextElement();
2494	2583	}
..	..	@@ -2496,19 +2585,22 @@
2496	2585	} else
2497	2586	{
2498	2587	//super.
2499		- drawEditHandles0(info, level + 1);
	2588	+ drawEditHandles0(//info,
	2589	+ level + 1);
2500	2590	}
2501	2591	}
2502	2592
2503		- boolean doEditClick(ClickInfo info, int level)
	2593	+ boolean doEditClick(//ClickInfo info,
	2594	+ int level)
2504	2595	{
2505	2596	doSomething = 0;
2506	2597	if (level == 0)
2507	2598	{
2508		- return doParentClick(info);
	2599	+ return doParentClick(); //info);
2509	2600	}
2510	2601	if (//super.
2511		- doEditClick0(info, level))
	2602	+ doEditClick0(//info,
	2603	+ level))
2512	2604	{
2513	2605	doSomething = 1;
2514	2606	return true;
..	..	@@ -2518,7 +2610,7 @@
2518	2610	}
2519	2611	}
2520	2612
2521		- boolean doParentClick(ClickInfo info)
	2613	+ boolean doParentClick() //ClickInfo info)
2522	2614	{
2523	2615	if (selection == null)
2524	2616	{
..	..	@@ -2531,7 +2623,8 @@
2531	2623	for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
2532	2624	{
2533	2625	Object3D selectee = (Object3D) e.nextElement();
2534		- if (selectee.doEditClick(info, 1))
	2626	+ if (selectee.doEditClick(//info,
	2627	+ 1))
2535	2628	{
2536	2629	childToDrag = selectee;
2537	2630	doSomething = 2;
..	..	@@ -2543,13 +2636,15 @@
2543	2636	return retval;
2544	2637	}
2545	2638
2546		- void doEditDrag(ClickInfo info, boolean opposite)
	2639	+ void doEditDrag(//ClickInfo clickInfo,
	2640	+ boolean opposite)
2547	2641	{
2548	2642	switch (doSomething)
2549	2643	{
2550	2644	case 1: // '\001'
2551	2645	//super.
2552		- doEditDrag0(info, opposite);
	2646	+ doEditDrag0(//clickInfo,
	2647	+ opposite);
2553	2648	break;
2554	2649
2555	2650	case 2: // '\002'
..	..	@@ -2562,11 +2657,13 @@
2562	2657	{
2563	2658	//sel.hitSomething = childToDrag.hitSomething;
2564	2659	//childToDrag.doEditDrag(info);
2565		- sel.doEditDrag(info, opposite);
	2660	+ sel.doEditDrag(//clickInfo,
	2661	+ opposite);
2566	2662	} else
2567	2663	{
2568	2664	//super.
2569		- doEditDrag0(info, opposite);
	2665	+ doEditDrag0(//clickInfo,
	2666	+ opposite);
2570	2667	}
2571	2668	}
2572	2669	break;
..	..	@@ -2584,6 +2681,9 @@
2584	2681	{
2585	2682	deselectAll();
2586	2683	}
	2684	+
	2685	+ new Exception().printStackTrace();
	2686	+
2587	2687	ClickInfo newInfo = new ClickInfo();
2588	2688	newInfo.flags = info.flags;
2589	2689	newInfo.bounds = info.bounds;
..	..	@@ -2676,6 +2776,18 @@
2676	2776	void GenNormalsS(boolean crease)
2677	2777	{
2678	2778	selection.GenNormals(crease);
	2779	+// for (int i=0; i<selection.size(); i++)
	2780	+// {
	2781	+// Object3D selectee = (Object3D) selection.elementAt(i);
	2782	+// selectee.GenNormals(crease);
	2783	+// }
	2784	+
	2785	+ //Touch();
	2786	+ }
	2787	+
	2788	+ void GenNormalsMeshS()
	2789	+ {
	2790	+ selection.GenNormalsMesh();
2679	2791	// for (int i=0; i<selection.size(); i++)
2680	2792	// {
2681	2793	// Object3D selectee = (Object3D) selection.elementAt(i);
..	..	@@ -2816,6 +2928,24 @@
2816	2928	if (child == null)
2817	2929	continue;
2818	2930	child.GenNormals(crease);
	2931	+// Children().release(i);
	2932	+ }
	2933	+ blockloop = false;
	2934	+ }
	2935	+
	2936	+ void GenNormalsMesh()
	2937	+ {
	2938	+ if (blockloop)
	2939	+ return;
	2940	+
	2941	+ blockloop = true;
	2942	+ GenNormalsMesh0();
	2943	+ for (int i = 0; i < Children().Size(); i++)
	2944	+ {
	2945	+ Object3D child = (Object3D) Children().get(i); // reserve(i);
	2946	+ if (child == null)
	2947	+ continue;
	2948	+ child.GenNormalsMesh();
2819	2949	// Children().release(i);
2820	2950	}
2821	2951	blockloop = false;
..	..	@@ -2988,11 +3118,20 @@
2988	3118	}
2989	3119	}
2990	3120
	3121	+ void GenNormalsMesh0()
	3122	+ {
	3123	+ if (bRep != null)
	3124	+ {
	3125	+ bRep.GenerateNormalsMesh();
	3126	+ Touch();
	3127	+ }
	3128	+ }
	3129	+
2991	3130	void GenNormalsMINE0()
2992	3131	{
2993	3132	if (bRep != null)
2994	3133	{
2995		- bRep.GenerateNormalsMINE();
	3134	+ bRep.MergeNormals(); //.GenerateNormalsMINE();
2996	3135	Touch();
2997	3136	}
2998	3137	}
..	..	@@ -3438,7 +3577,8 @@
3438	3577	if (blockloop)
3439	3578	return;
3440	3579
3441		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3580	+ if (//marked \|\| // does not make sense
	3581	+ (bRep != null \|\| material != null)) // borderline...
3442	3582	live = h;
3443	3583
3444	3584	for (int i = 0; i < Size(); i++)
..	..	@@ -3459,7 +3599,8 @@
3459	3599	return;
3460	3600
3461	3601	//if (bRep != null)
3462		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3602	+ if (//marked \|\| // does not make sense
	3603	+ (bRep != null \|\| material != null)) // borderline...
3463	3604	link2master = h;
3464	3605
3465	3606	for (int i = 0; i < Size(); i++)
..	..	@@ -3479,7 +3620,8 @@
3479	3620	if (blockloop)
3480	3621	return;
3481	3622
3482		- if (marked \|\| (bRep != null && material != null)) // borderline...
	3623	+ if (//marked \|\| // does not make sense
	3624	+ (bRep != null \|\| material != null)) // borderline...
3483	3625	hide = h;
3484	3626
3485	3627	for (int i = 0; i < Size(); i++)
..	..	@@ -3499,7 +3641,7 @@
3499	3641	if (blockloop)
3500	3642	return;
3501	3643
3502		- if (bRep != null && material != null) // borderline...
	3644	+ if (bRep != null \|\| material != null) // borderline...
3503	3645	marked = h;
3504	3646
3505	3647	for (int i = 0; i < Size(); i++)
..	..	@@ -3509,6 +3651,46 @@
3509	3651	continue;
3510	3652	blockloop = true;
3511	3653	child.MarkLeaves(h);
	3654	+ blockloop = false;
	3655	+ // release(i);
	3656	+ }
	3657	+ }
	3658	+
	3659	+ void RewindLeaves(boolean h)
	3660	+ {
	3661	+ if (blockloop)
	3662	+ return;
	3663	+
	3664	+ if (bRep != null \|\| material != null) // borderline...
	3665	+ rewind = h;
	3666	+
	3667	+ for (int i = 0; i < Size(); i++)
	3668	+ {
	3669	+ Object3D child = (Object3D) get(i); // reserve(i);
	3670	+ if (child == null)
	3671	+ continue;
	3672	+ blockloop = true;
	3673	+ child.RewindLeaves(h);
	3674	+ blockloop = false;
	3675	+ // release(i);
	3676	+ }
	3677	+ }
	3678	+
	3679	+ void RandomLeaves(boolean h)
	3680	+ {
	3681	+ if (blockloop)
	3682	+ return;
	3683	+
	3684	+ if (bRep != null \|\| material != null) // borderline...
	3685	+ random = h;
	3686	+
	3687	+ for (int i = 0; i < Size(); i++)
	3688	+ {
	3689	+ Object3D child = (Object3D) get(i); // reserve(i);
	3690	+ if (child == null)
	3691	+ continue;
	3692	+ blockloop = true;
	3693	+ child.RandomLeaves(h);
3512	3694	blockloop = false;
3513	3695	// release(i);
3514	3696	}
..	..	@@ -4286,6 +4468,55 @@
4286	4468	}
4287	4469	}
4288	4470
	4471	+ void RepairSOV()
	4472	+ {
	4473	+ if (blockloop)
	4474	+ return;
	4475	+
	4476	+ String texname = this.GetPigmentTexture();
	4477	+
	4478	+ if (texname.startsWith("sov"))
	4479	+ {
	4480	+ String[] s = texname.split("/");
	4481	+
	4482	+ String[] sname = s[1].split("Color.pn");
	4483	+
	4484	+ texname = sname[0];
	4485	+
	4486	+ if (sname.length > 1)
	4487	+ {
	4488	+ texname += "Color.jpg";
	4489	+ }
	4490	+
	4491	+ this.SetPigmentTexture("sov/" + texname);
	4492	+ }
	4493	+
	4494	+ texname = this.GetBumpTexture();
	4495	+
	4496	+ if (texname.startsWith("sov"))
	4497	+ {
	4498	+ String[] s = texname.split("/");
	4499	+
	4500	+ String[] sname = s[1].split("Bump.pn");
	4501	+
	4502	+ texname = sname[0];
	4503	+
	4504	+ if (sname.length > 1)
	4505	+ {
	4506	+ texname += "Bump.jpg";
	4507	+ }
	4508	+
	4509	+ this.SetBumpTexture("sov/" + texname);
	4510	+ }
	4511	+
	4512	+ for (int i=0; i<Size(); i++)
	4513	+ {
	4514	+ blockloop = true;
	4515	+ get(i).RepairSOV();
	4516	+ blockloop = false;
	4517	+ }
	4518	+ }
	4519	+
4289	4520	void RepairTexture()
4290	4521	{
4291	4522	if (this instanceof FileObject \|\| blockloop)
..	..	@@ -4800,6 +5031,14 @@
4800	5031	}
4801	5032	}
4802	5033
	5034	+ ObjEditor GetWindow()
	5035	+ {
	5036	+ if (editWindow != null)
	5037	+ return editWindow;
	5038	+
	5039	+ return manipWindow;
	5040	+ }
	5041	+
4803	5042	cTreePath Select(int indexcount, boolean deselect)
4804	5043	{
4805	5044	if (hide \|\| dontselect)
..	..	@@ -4836,10 +5075,11 @@
4836	5075	if (leaf != null)
4837	5076	{
4838	5077	cTreePath tp = new cTreePath(this, leaf);
4839		- if (editWindow != null)
	5078	+ ObjEditor window = GetWindow();
	5079	+ if (window != null)
4840	5080	{
4841	5081	//System.out.println("editWindow = " + editWindow + " vs " + this);
4842		- editWindow.Select(tp, deselect, true);
	5082	+ window.Select(tp, deselect, true);
4843	5083	}
4844	5084
4845	5085	return tp;
..	..	@@ -4856,6 +5096,7 @@
4856	5096
4857	5097	if (child == null)
4858	5098	continue;
	5099	+
4859	5100	if (child.HasTransparency() && child.size() != 0)
4860	5101	{
4861	5102	cTreePath leaf = child.Select(indexcount, deselect);
..	..	@@ -4865,9 +5106,10 @@
4865	5106	if (leaf != null)
4866	5107	{
4867	5108	cTreePath tp = new cTreePath(this, leaf);
4868		- if (editWindow != null)
	5109	+ ObjEditor window = GetWindow();
	5110	+ if (window != null)
4869	5111	{
4870		- editWindow.Select(tp, deselect, true);
	5112	+ window.Select(tp, deselect, true);
4871	5113	}
4872	5114
4873	5115	return tp;
..	..	@@ -5192,6 +5434,51 @@
5192	5434	blockloop = false;
5193	5435	}
5194	5436
	5437	+ void ResetSelectable()
	5438	+ {
	5439	+ if (blockloop)
	5440	+ return;
	5441	+
	5442	+ blockloop = true;
	5443	+
	5444	+ keepdontselect = dontselect;
	5445	+ dontselect = true;
	5446	+
	5447	+ Object3D child;
	5448	+ int nb = Size();
	5449	+ for (int i = 0; i < nb; i++)
	5450	+ {
	5451	+ child = (Object3D) get(i);
	5452	+ if (child == null)
	5453	+ continue;
	5454	+ child.ResetSelectable();
	5455	+ }
	5456	+
	5457	+ blockloop = false;
	5458	+ }
	5459	+
	5460	+ void RestoreSelectable()
	5461	+ {
	5462	+ if (blockloop)
	5463	+ return;
	5464	+
	5465	+ blockloop = true;
	5466	+
	5467	+ dontselect = keepdontselect;
	5468	+
	5469	+ Object3D child;
	5470	+ int nb = Size();
	5471	+ for (int i = 0; i < nb; i++)
	5472	+ {
	5473	+ child = (Object3D) get(i);
	5474	+ if (child == null)
	5475	+ continue;
	5476	+ child.RestoreSelectable();
	5477	+ }
	5478	+
	5479	+ blockloop = false;
	5480	+ }
	5481	+
5195	5482	boolean IsSelected()
5196	5483	{
5197	5484	if (parent == null)
..	..	@@ -5501,6 +5788,38 @@
5501	5788	}
5502	5789	}
5503	5790
	5791	+ void EmbedTextures(boolean embed)
	5792	+ {
	5793	+ if (blockloop)
	5794	+ return;
	5795	+
	5796	+ //if (GetTextures() != null)
	5797	+ if (embed)
	5798	+ CameraPane.EmbedTextures(GetTextures());
	5799	+ else
	5800	+ {
	5801	+ GetTextures().pigmentdata = null;
	5802	+ GetTextures().bumpdata = null;
	5803	+ GetTextures().pw = 0;
	5804	+ GetTextures().ph = 0;
	5805	+ GetTextures().bw = 0;
	5806	+ GetTextures().bh = 0;
	5807	+ }
	5808	+
	5809	+ int nb = Size();
	5810	+ for (int i = 0; i < nb; i++)
	5811	+ {
	5812	+ Object3D child = (Object3D) get(i);
	5813	+
	5814	+ if (child == null)
	5815	+ continue;
	5816	+
	5817	+ blockloop = true;
	5818	+ child.EmbedTextures(embed);
	5819	+ blockloop = false;
	5820	+ }
	5821	+ }
	5822	+
5504	5823	void draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5505	5824	{
5506	5825	Draw(display, root, selected, blocked);
..	..	@@ -5509,12 +5828,23 @@
5509	5828	boolean NeedSupport()
5510	5829	{
5511	5830	return
5512		- CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| !Globals.FREEZEONMOVE) && link2master && /live &&/ support != null
	5831	+ CameraPane.SUPPORT && (!CameraPane.movingcamera \|\| (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /live &&/ support != null
5513	5832	// PROBLEM with CROWD!!
5514	5833	&& (Globals.DrawMode() == iCameraPane.SHADOW \|\| !Globals.RENDERSHADOW \|\| Globals.CROWD);
5515	5834	}
5516	5835
5517	5836	static boolean DEBUG_SELECTION = false;
	5837	+
	5838	+ boolean IsLive()
	5839	+ {
	5840	+ if (live)
	5841	+ return true;
	5842	+
	5843	+ if (parent == null)
	5844	+ return false;
	5845	+
	5846	+ return parent.IsLive();
	5847	+ }
5518	5848
5519	5849	void Draw(iCameraPane display, Object3D /Composite/ root, boolean selected, boolean blocked)
5520	5850	{
..	..	@@ -5577,7 +5907,7 @@
5577	5907	support = support;
5578	5908
5579	5909	//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);
	5910	+ boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT \|\| support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5581	5911
5582	5912	if (!usecalllists && bRep != null && bRep.displaylist > 0)
5583	5913	{
..	..	@@ -5597,10 +5927,12 @@
5597	5927	boolean selectmode = display.DrawMode() == display.SELECTION \|\| display.IsDebugSelection();
5598	5928
5599	5929	if (!selectmode && //display.DrawMode() != display.SELECTION &&
5600		- (touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5930	+ //(touched \|\| (bRep != null && bRep.displaylist <= 0)))
	5931	+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE \|\| touched && Globals.COMPUTESHADOWWHENLIVE)) // \|\| (bRep != null && bRep.displaylist <= 0)))
5601	5932	{
5602	5933	Globals.lighttouched = true;
5603	5934	} // all panes...
	5935	+
5604	5936	//if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
5605	5937	if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
5606	5938	(touched \|\| (bRep != null && bRep.displaylist <= 0)))
..	..	@@ -5728,6 +6060,7 @@
5728	6060	if (GetBRep() != null)
5729	6061	{
5730	6062	display.NextIndex();
	6063	+
5731	6064	// vertex color conflict : gl.glCallList(list);
5732	6065	DrawNode(display, root, selected);
5733	6066	if (this instanceof BezierPatch)
..	..	@@ -5768,16 +6101,27 @@
5768	6101	tex = GetTextures();
5769	6102	}
5770	6103
5771		- boolean failed = false;
	6104	+ boolean failedPigment = false;
	6105	+ boolean failedBump = false;
5772	6106
5773	6107	try
5774	6108	{
5775		- display.BindTextures(tex, texres);
	6109	+ display.BindPigmentTexture(tex, texres);
5776	6110	}
5777	6111	catch (Exception e)
5778	6112	{
5779	6113	System.err.println("FAILED: " + this);
5780		- failed = true;
	6114	+ failedPigment = true;
	6115	+ }
	6116	+
	6117	+ try
	6118	+ {
	6119	+ display.BindBumpTexture(tex, texres);
	6120	+ }
	6121	+ catch (Exception e)
	6122	+ {
	6123	+ //System.err.println("FAILED: " + this);
	6124	+ failedBump = true;
5781	6125	}
5782	6126
5783	6127	if (!compiled)
..	..	@@ -5800,8 +6144,11 @@
5800	6144	}
5801	6145	}
5802	6146
5803		- if (!failed)
5804		- display.ReleaseTextures(tex);
	6147	+ if (!failedBump)
	6148	+ display.ReleaseBumpTexture(tex);
	6149	+
	6150	+ if (!failedPigment)
	6151	+ display.ReleasePigmentTexture(tex);
5805	6152
5806	6153	display.PopMaterial(this, selected);
5807	6154	}
..	..	@@ -6174,6 +6521,11 @@
6174	6521	// dec 2012
6175	6522	new Exception().printStackTrace();
6176	6523	return;
	6524	+ }
	6525	+
	6526	+ if (dontselect)
	6527	+ {
	6528	+ //bRep.GenerateNormalsMINE();
6177	6529	}
6178	6530
6179	6531	display.DrawGeometry(bRep, flipV, selectmode);
..	..	@@ -6959,20 +7311,23 @@
6959	7311	}
6960	7312	}
6961	7313
6962		- protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
	7314	+ static ClickInfo clickInfo = new ClickInfo();
	7315	+
	7316	+ protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
	7317	+ Point outPt, Rectangle outRec)
6963	7318	{
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;
	7319	+ int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
	7320	+ int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
	7321	+ double[][] toscreen = clickInfo.toScreen;
6967	7322	if (toscreen == null)
6968	7323	{
6969		- toscreen = new Camera(info.camera.viewCode).toScreen;
	7324	+ toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
6970	7325	}
6971	7326	cVector vec = in;
6972	7327	LA.xformPos(in, toscreen, in);
6973	7328	//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();
	7329	+ vec.x = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
	7330	+ vec.y = 100 clickInfo.camera.SCALE / clickInfo.camera.Distance();
6976	7331	outPt.x = hc + (int) vec.x;
6977	7332	outPt.y = vc - (int) vec.y;
6978	7333	outRec.x = outPt.x - 3;
..	..	@@ -6980,15 +7335,18 @@
6980	7335	outRec.width = outRec.height = 6;
6981	7336	}
6982	7337
6983		- protected Rectangle calcHotSpot(cVector in, ClickInfo info)
	7338	+ protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
	7339	+ )
6984	7340	{
6985	7341	Point pt = new Point(0, 0);
6986	7342	Rectangle rec = new Rectangle();
6987		- calcHotSpot(in, info, pt, rec);
	7343	+ calcHotSpot(in, //clickInfo,
	7344	+ pt, rec);
6988	7345	return rec;
6989	7346	}
6990	7347
6991		- void drawEditHandles0(ClickInfo info, int level)
	7348	+ void drawEditHandles0(//ClickInfo clickInfo,
	7349	+ int level)
6992	7350	{
6993	7351	if (level == 0)
6994	7352	{
..	..	@@ -6997,16 +7355,19 @@
6997	7355	{
6998	7356	cVector origin = new cVector();
6999	7357	//LA.xformPos(origin, toParent, origin);
7000		- Rectangle spot = calcHotSpot(origin, info);
	7358	+ if (this.clickInfo == null)
	7359	+ this.clickInfo = new ClickInfo();
	7360	+
	7361	+ Rectangle spot = calcHotSpot(origin); //, clickInfo);
7001	7362	Rectangle boundary = new Rectangle();
7002	7363	boundary.x = spot.x - 30;
7003	7364	boundary.y = spot.y - 30;
7004	7365	boundary.width = spot.width + 60;
7005	7366	boundary.height = spot.height + 60;
7006		- info.g.setColor(Color.red);
	7367	+ clickInfo.g.setColor(Color.red);
7007	7368	int spotw = spot.x + spot.width;
7008	7369	int spoth = spot.y + spot.height;
7009		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7370	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7010	7371	// if (CameraPane.Xmin > spot.x)
7011	7372	// {
7012	7373	// CameraPane.Xmin = spot.x;
..	..	@@ -7026,8 +7387,8 @@
7026	7387	spot.translate(32, 32);
7027	7388	spotw = spot.x + spot.width;
7028	7389	spoth = spot.y + spot.height;
7029		- info.g.setColor(Color.blue);
7030		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7390	+ clickInfo.g.setColor(Color.cyan);
	7391	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7031	7392	// if (CameraPane.Xmin > spot.x)
7032	7393	// {
7033	7394	// CameraPane.Xmin = spot.x;
..	..	@@ -7044,11 +7405,12 @@
7044	7405	// {
7045	7406	// CameraPane.Ymax = spoth;
7046	7407	// }
7047		- // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7048		- //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
	7408	+ // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
	7409	+ //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7049	7410	spot.translate(0, -32);
7050		- info.g.setColor(Color.green);
7051		- info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7411	+ clickInfo.g.setColor(Color.yellow);
	7412	+ clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
	7413	+ clickInfo.g.setColor(Color.green);
7052	7414	// if (CameraPane.Xmin > spot.x)
7053	7415	// {
7054	7416	// CameraPane.Xmin = spot.x;
..	..	@@ -7065,8 +7427,8 @@
7065	7427	// {
7066	7428	// CameraPane.Ymax = spoth;
7067	7429	// }
7068		- info.g.drawArc(boundary.x, boundary.y,
7069		- boundary.width, boundary.height, 0, 360);
	7430	+ clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
	7431	+ (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
7070	7432	//info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
7071	7433	// if (CameraPane.Xmin > boundary.x)
7072	7434	// {
..	..	@@ -7088,7 +7450,8 @@
7088	7450	}
7089	7451	}
7090	7452
7091		- boolean doEditClick0(ClickInfo info, int level)
	7453	+ boolean doEditClick0(//ClickInfo clickInfo,
	7454	+ int level)
7092	7455	{
7093	7456	if (level == 0)
7094	7457	{
..	..	@@ -7097,8 +7460,8 @@
7097	7460
7098	7461	boolean retval = false;
7099	7462
7100		- startX = info.x;
7101		- startY = info.y;
	7463	+ startX = clickInfo.x;
	7464	+ startY = clickInfo.y;
7102	7465
7103	7466	hitSomething = -1;
7104	7467	cVector origin = new cVector();
..	..	@@ -7108,22 +7471,51 @@
7108	7471	{
7109	7472	centerPt = new Point(0, 0);
7110	7473	}
7111		- calcHotSpot(origin, info, centerPt, spot);
7112		- if (spot.contains(info.x, info.y))
	7474	+ calcHotSpot(origin, //info,
	7475	+ centerPt, spot);
	7476	+ if (spot.contains(clickInfo.x, clickInfo.y))
7113	7477	{
7114	7478	hitSomething = hitCenter;
7115	7479	retval = true;
7116	7480	}
7117	7481	spot.translate(32, 0);
7118		- if (spot.contains(info.x, info.y))
	7482	+ if (spot.contains(clickInfo.x, clickInfo.y))
7119	7483	{
7120	7484	hitSomething = hitRotate;
7121	7485	retval = true;
7122	7486	}
7123	7487	spot.translate(0, 32);
7124		- if (spot.contains(info.x, info.y))
	7488	+ if (spot.contains(clickInfo.x, clickInfo.y))
7125	7489	{
7126	7490	hitSomething = hitScale;
	7491	+
	7492	+ double scale = 0.005f * clickInfo.camera.Distance();
	7493	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
	7494	+ double sign = 1;
	7495	+ if (hScale < 0)
	7496	+ {
	7497	+ sign = -1;
	7498	+ }
	7499	+ hScale = signMath.pow(signhScale, scale * 50);
	7500	+ if (hScale < 0.01)
	7501	+ {
	7502	+ //hScale = 0.01;
	7503	+ }
	7504	+
	7505	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
	7506	+ sign = 1;
	7507	+ if (vScale < 0)
	7508	+ {
	7509	+ sign = -1;
	7510	+ }
	7511	+ vScale = signMath.pow(signvScale, scale * 50);
	7512	+ if (vScale < 0.01)
	7513	+ {
	7514	+ //vScale = 0.01;
	7515	+ }
	7516	+
	7517	+ clickInfo.scale = Math.sqrt(hScalehScale + vScalevScale);
	7518	+
7127	7519	retval = true;
7128	7520	}
7129	7521
..	..	@@ -7133,7 +7525,7 @@
7133	7525	}
7134	7526
7135	7527	//System.out.println("info.modifiers = " + info.modifiers);
7136		- modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
	7528	+ modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
7137	7529	//System.out.println("modified = " + modified);
7138	7530	//new Exception().printStackTrace();
7139	7531	//viewCode = info.pane.renderCamera.viewCode;
..	..	@@ -7161,7 +7553,8 @@
7161	7553	return true;
7162	7554	}
7163	7555
7164		- void doEditDrag0(ClickInfo info, boolean opposite)
	7556	+ void doEditDrag0(//ClickInfo info,
	7557	+ boolean opposite)
7165	7558	{
7166	7559	if (hitSomething == 0)
7167	7560	{
..	..	@@ -7175,7 +7568,7 @@
7175	7568
7176	7569	//System.out.println("hitSomething = " + hitSomething);
7177	7570
7178		- double scale = 0.005f * info.camera.Distance();
	7571	+ double scale = 0.005f * clickInfo.camera.Distance();
7179	7572
7180	7573	cVector xlate = new cVector();
7181	7574	//cVector xlate2 = new cVector();
..	..	@@ -7209,8 +7602,8 @@
7209	7602	toParent[3][i] = xlate.get(i);
7210	7603	LA.matInvert(toParent, fromParent);
7211	7604	*/
7212		- cVector delta = LA.newVector(0, 0, startY - info.y);
7213		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7605	+ cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
	7606	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7214	7607
7215	7608	LA.matCopy(startMat, toParent);
7216	7609	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7219,7 +7612,7 @@
7219	7612	} else
7220	7613	{
7221	7614	//LA.xformDir(delta, info.camera.fromScreen, delta);
7222		- cVector up = new cVector(info.camera.up);
	7615	+ cVector up = new cVector(clickInfo.camera.up);
7223	7616	cVector away = new cVector();
7224	7617	//cVector right2 = new cVector();
7225	7618	//LA.vecCross(up, cVector.Z, right);
..	..	@@ -7236,19 +7629,19 @@
7236	7629	LA.xformDir(up, ClickInfo.matbuffer, up);
7237	7630	// if (!CameraPane.LOCALTRANSFORM)
7238	7631	LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7239		- LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
	7632	+ LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
7240	7633	// if (!CameraPane.LOCALTRANSFORM)
7241	7634	LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
7242	7635	//LA.vecCross(up, cVector.Z, right2);
7243	7636
7244		- cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
	7637	+ cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
7245	7638
7246	7639	//System.out.println("DELTA0 = " + delta);
7247	7640	//System.out.println("AWAY = " + info.camera.away);
7248	7641	//System.out.println("UP = " + info.camera.up);
7249	7642	if (away.z > 0)
7250	7643	{
7251		- if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
	7644	+ if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7252	7645	{
7253	7646	delta.x = -delta.x;
7254	7647	} else
..	..	@@ -7263,7 +7656,7 @@
7263	7656	//System.out.println("DELTA1 = " + delta);
7264	7657	LA.xformDir(delta, ClickInfo.matbuffer, delta);
7265	7658	//System.out.println("DELTA2 = " + delta);
7266		- LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
	7659	+ LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
7267	7660	LA.matCopy(startMat, toParent);
7268	7661	//System.out.println("DELTA3 = " + delta);
7269	7662	LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
..	..	@@ -7273,8 +7666,8 @@
7273	7666	break;
7274	7667
7275	7668	case hitRotate: // rotate
7276		- int dx = info.x - centerPt.x;
7277		- int dy = -(info.y - centerPt.y);
	7669	+ int dx = clickInfo.x - centerPt.x;
	7670	+ int dy = -(clickInfo.y - centerPt.y);
7278	7671	double angle = (double) Math.atan2(dx, dy);
7279	7672	angle = -(1.570796 - angle);
7280	7673
..	..	@@ -7297,7 +7690,7 @@
7297	7690	}
7298	7691	/**/
7299	7692
7300		- switch (info.pane.RenderCamera().viewCode)
	7693	+ switch (clickInfo.pane.RenderCamera().viewCode)
7301	7694	{
7302	7695	case 1: // '\001'
7303	7696	LA.matZRotate(toParent, angle);
..	..	@@ -7324,7 +7717,7 @@
7324	7717	break;
7325	7718
7326	7719	case hitScale: // scale
7327		- double hScale = (double) (info.x - centerPt.x) / 32;
	7720	+ double hScale = (double) (clickInfo.x /- centerPt.x/) / 32;
7328	7721	double sign = 1;
7329	7722	if (hScale < 0)
7330	7723	{
..	..	@@ -7336,7 +7729,7 @@
7336	7729	//hScale = 0.01;
7337	7730	}
7338	7731
7339		- double vScale = (double) (info.y - centerPt.y) / 32;
	7732	+ double vScale = (double) (clickInfo.y /- centerPt.y/) / 32;
7340	7733	sign = 1;
7341	7734	if (vScale < 0)
7342	7735	{
..	..	@@ -7347,6 +7740,7 @@
7347	7740	{
7348	7741	//vScale = 0.01;
7349	7742	}
	7743	+
7350	7744	LA.matCopy(startMat, toParent);
7351	7745	/**/
7352	7746	for (int i = 0; i < 3; i++)
..	..	@@ -7356,29 +7750,30 @@
7356	7750	}
7357	7751	/**/
7358	7752
7359		- double totalScale = Math.sqrt(hScalehScale + vScalevScale) / Math.sqrt(2);
	7753	+ double totalScale = Math.sqrt(hScalehScale + vScalevScale) / clickInfo.scale;
7360	7754
7361	7755	if (totalScale < 0.01)
7362	7756	{
7363	7757	totalScale = 0.01;
7364	7758	}
7365	7759
7366		- switch (info.pane.RenderCamera().viewCode)
	7760	+ switch (clickInfo.pane.RenderCamera().viewCode)
7367	7761	{
7368	7762	case 3: // '\001'
7369		- if (modified)
	7763	+ if (modified \|\| opposite)
7370	7764	{
7371	7765	//LA.matScale(toParent, 1, hScale, vScale);
7372	7766	LA.matScale(toParent, totalScale, 1, 1);
7373	7767	} // vScale, 1);
7374	7768	else
7375	7769	{
	7770	+ // EXCEPTION!
7376	7771	LA.matScale(toParent, totalScale, totalScale, totalScale);
7377	7772	} // vScale, 1);
7378	7773	break;
7379	7774
7380	7775	case 2: // '\002'
7381		- if (modified)
	7776	+ if (modified \|\| opposite)
7382	7777	{
7383	7778	//LA.matScale(toParent, hScale, 1, vScale);
7384	7779	LA.matScale(toParent, 1, totalScale, 1);
..	..	@@ -7389,7 +7784,7 @@
7389	7784	break;
7390	7785
7391	7786	case 1: // '\003'
7392		- if (modified)
	7787	+ if (modified \|\| opposite)
7393	7788	{
7394	7789	//LA.matScale(toParent, hScale, vScale, 1);
7395	7790	LA.matScale(toParent, 1, 1, totalScale);
..	..	@@ -7429,7 +7824,7 @@
7429	7824	} // NEW ...
7430	7825
7431	7826
7432		- info.pane.repaint();
	7827	+ clickInfo.pane.repaint();
7433	7828	}
7434	7829
7435	7830	boolean overflow = false;
..	..	@@ -7609,6 +8004,10 @@
7609	8004	editWindow = null;
7610	8005	} // ?
7611	8006	}
	8007	+ else
	8008	+ {
	8009	+ //editWindow.closeUI();
	8010	+ }
7612	8011	}
7613	8012
7614	8013	boolean root; // patch for edit windows
..	..	@@ -7766,6 +8165,10 @@
7766	8165	}
7767	8166
7768	8167	transient ObjEditor editWindow;
	8168	+ transient ObjEditor manipWindow;
	8169	+
	8170	+ transient boolean pinned;
	8171	+
7769	8172	transient ObjectUI objectUI;
7770	8173	public static int povDepth = 0;
7771	8174	private static cVector tbMin = new cVector();