blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 26b24f5b623e709a88e91e9bce0864f9d5e8f084 
 Object3D.java
....@@ -24,6 +24,11 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
27
+    // TEMPORARY for mocap undo
28
+    mocap.reader.BVHReader.BVHResult bvh;
29
+    Object3D skeleton;
30
+    //
31
+    
2732     ScriptNode scriptnode;
2833 
2934         void InitOthers()
....@@ -104,125 +109,143 @@
104109     
105110 //    transient boolean reduced; // for morph reduction
106111     
107
-transient com.bulletphysics.linearmath.Transform cache; // for fast merge
108
-transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
112
+    transient com.bulletphysics.linearmath.Transform cache; // for fast merge
113
+    transient com.bulletphysics.linearmath.Transform cache_1; // for fast merge
109114 
110
-transient Object3D transientsupport; // for cloning
111
-transient boolean transientlink2master;
115
+    transient Object3D transientsupport; // for cloning
116
+    transient boolean transientlink2master;
112117 
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)
118
+    void SaveSupports()
125119     {
126
-        bRep.SaveSupports();
120
+        if (blockloop)
121
+            return;
122
+
123
+        transientsupport = support;
124
+        transientlink2master = link2master;
125
+
126
+        support = null;
127
+        link2master = false;
128
+
129
+        if (bRep != null)
130
+        {
131
+            bRep.SaveSupports();
132
+        }
133
+
134
+        for (int i = 0; i < Size(); i++)
135
+        {
136
+            Object3D child = (Object3D) get(i);
137
+            if (child == null)
138
+                continue;
139
+            blockloop = true;
140
+            child.SaveSupports();
141
+            blockloop = false;
142
+        }
127143     }
128
-    
129
-    for (int i = 0; i < Size(); i++)
144
+
145
+    void RestoreSupports()
130146     {
131
-        Object3D child = (Object3D) get(i);
132
-        if (child == null)
133
-            continue;
147
+        if (blockloop)
148
+            return;
149
+
150
+        support = transientsupport;
151
+        link2master = transientlink2master;
152
+        transientsupport = null;
153
+        transientlink2master = false;
154
+
155
+        if (bRep != null)
156
+        {
157
+            bRep.RestoreSupports();
158
+        }
159
+
160
+        for (int i = 0; i < Size(); i++)
161
+        {
162
+            Object3D child = (Object3D) get(i);
163
+            if (child == null)
164
+                continue;
165
+            blockloop = true;
166
+            child.RestoreSupports();
167
+            blockloop = false;
168
+        }
169
+    }
170
+
171
+    void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172
+    {
173
+        if (hashtable.containsKey(GetUUID()))
174
+        {
175
+            Object3D o = hashtable.get(GetUUID());
176
+
177
+            Grafreed.Assert(this.bRep == o.bRep);
178
+            if (this.bRep != null)
179
+                assert(this.bRep.support == o.transientrep);
180
+
181
+            return;
182
+        }
183
+
184
+        Object3D o = new Object3D("copy of " + this.name);
185
+
186
+        hashtable.put(GetUUID(), o);
187
+
188
+        for (int i=0; i<Size(); i++)
189
+        {
190
+            get(i).ExtractBigData(hashtable);
191
+        }
192
+        
193
+        ExtractBigData(o);
194
+    }
195
+
196
+    void ExtractBigData(Object3D o)
197
+    {
198
+        o.bRep = this.bRep;
199
+        if (this.bRep != null)
200
+        {
201
+            o.transientrep = this.bRep.support;
202
+            o.bRep.support = null;
203
+        }
204
+        
205
+        //    o.support = this.support;
206
+        //    o.fileparent = this.fileparent;
207
+        //    if (this.bRep != null)
208
+        //        o.bRep = this.bRep.support;
209
+        
210
+        this.bRep = null;
211
+    //    if (this.bRep != null)
212
+    //        this.bRep.support = null;
213
+    //    this.support = null;
214
+    //    this.fileparent = null;
215
+    }
216
+
217
+    void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
218
+    {
219
+        if (!hashtable.containsKey(GetUUID()))
220
+            return;
221
+
222
+        if (blockloop)
223
+            return;
224
+
134225         blockloop = true;
135
-        child.SaveSupports();
136
-        blockloop = false;
137
-    }
138
-}
139226 
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)
151
-    {
152
-        bRep.RestoreSupports();
153
-    }
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
-    {
170227         Object3D o = hashtable.get(GetUUID());
171228 
172
-        assert(this.bRep == o.bRep);
173
-        if (this.bRep != null)
174
-            assert(this.bRep.support == o.transientrep);
175
-        
176
-        return;
177
-    }
178
-    
179
-    Object3D o = new Object3D();
180
-    o.bRep = this.bRep;
181
-    if (this.bRep != null)
182
-    {
183
-        o.transientrep = this.bRep.support;
184
-        o.bRep.support = null;
185
-    }
186
-    
187
-//    o.support = this.support;
188
-//    o.fileparent = this.fileparent;
189
-//    if (this.bRep != null)
190
-//        o.bRep = this.bRep.support;
191
-    
192
-    hashtable.put(GetUUID(), o);
193
-    
194
-    this.bRep = null;
195
-//    if (this.bRep != null)
196
-//        this.bRep.support = null;
197
-//    this.support = null;
198
-//    this.fileparent = null;
199
-    
200
-    for (int i=0; i<Size(); i++)
201
-    {
202
-        get(i).ExtractBigData(hashtable);
203
-    }
204
-}
229
+        RestoreBigData(o);
205230 
206
-void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
207
-{
208
-    if (!hashtable.containsKey(GetUUID()))
209
-        return;
210
-    
211
-    Object3D o = hashtable.get(GetUUID());
212
-    
213
-    this.bRep = o.bRep;
214
-    if (this.bRep != null)
215
-        this.bRep.support = o.transientrep;
216
-//    this.support = o.support;
217
-//    this.fileparent = o.fileparent;
218
-    
219
-    hashtable.remove(GetUUID());
220
-    
221
-    for (int i=0; i<Size(); i++)
222
-    {
223
-        get(i).RestoreBigData(hashtable);
231
+        //hashtable.remove(GetUUID());
232
+
233
+        for (int i=0; i<Size(); i++)
234
+        {
235
+            get(i).RestoreBigData(hashtable);
236
+        }
237
+        
238
+        blockloop = false;
224239     }
225
-}
240
+
241
+    void RestoreBigData(Object3D o)
242
+    {
243
+        this.bRep = o.bRep;
244
+        if (this.bRep != null)
245
+            this.bRep.support = o.transientrep;
246
+    //    this.support = o.support;
247
+    //    this.fileparent = o.fileparent;
248
+    }
226249 
227250 // MOCAP SUPPORT
228251     double tx,ty,tz,rx,ry,rz;
....@@ -547,12 +570,14 @@
547570             toParent = LA.newMatrix();
548571             fromParent = LA.newMatrix();
549572         }
573
+        
550574         if (toParentMarked == null)
551575         {
552576             if (maxcount != 1)
553577             {
554578                 new Exception().printStackTrace();
555579             }
580
+            
556581             toParentMarked = LA.newMatrix();
557582             fromParentMarked = LA.newMatrix();
558583         }
....@@ -863,7 +888,7 @@
863888         
864889         if (marked && Globals.isLIVE() && live &&
865890                 //TEMP21aug2018
866
-                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
891
+                (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
867892                 currentframe != Globals.framecount)
868893         {
869894             currentframe = Globals.framecount;
....@@ -875,7 +900,8 @@
875900             
876901             boolean changedir = random && Math.random() < 0.01; // && !link2master;
877902 
878
-            if (transformcount*factor > maxcount || (step == 1 && changedir))
903
+            if (transformcount*factor >= maxcount && (rewind || random) ||
904
+                    (step == 1 && changedir))
879905             {
880906                 countdown = 1;
881907                 delay = speedup?8:1;
....@@ -947,6 +973,7 @@
947973         if (material == null || material.multiply)
948974             return true;
949975         
976
+        // Transparent objects are dynamic because we have to sort the triangles.
950977         return material.opacity > 0.99;
951978     }
952979     
....@@ -2368,6 +2395,10 @@
23682395         }
23692396          */
23702397         }
2398
+        else
2399
+        {
2400
+            //((ObjEditor)editWindow).SetupUI2(null);
2401
+        }
23712402     }
23722403 
23732404     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
....@@ -2409,6 +2440,14 @@
24092440         {
24102441             editWindow.refreshContents();
24112442         }
2443
+        else
2444
+        {
2445
+            if (manipWindow != null)
2446
+            {
2447
+                manipWindow.refreshContents();
2448
+            }
2449
+        }
2450
+                
24122451     //if (parent != null)
24132452     //parent.refreshEditWindow();
24142453     }
....@@ -2693,6 +2732,18 @@
26932732         //Touch();
26942733     }
26952734 
2735
+    void GenNormalsMeshS()
2736
+    {
2737
+        selection.GenNormalsMesh();
2738
+//        for (int i=0; i<selection.size(); i++)
2739
+//        {
2740
+//            Object3D selectee = (Object3D) selection.elementAt(i);
2741
+//            selectee.GenNormals(crease);
2742
+//        }
2743
+
2744
+        //Touch();
2745
+    }
2746
+
26962747     void ClearColorsS()
26972748     {
26982749         selection.ClearColors();
....@@ -2824,6 +2875,24 @@
28242875             if (child == null)
28252876                 continue;
28262877             child.GenNormals(crease);
2878
+//            Children().release(i);
2879
+        }
2880
+        blockloop = false;
2881
+    }
2882
+
2883
+    void GenNormalsMesh()
2884
+    {
2885
+        if (blockloop)
2886
+            return;
2887
+        
2888
+        blockloop = true;
2889
+        GenNormalsMesh0();
2890
+        for (int i = 0; i < Children().Size(); i++)
2891
+        {
2892
+            Object3D child = (Object3D) Children().get(i); // reserve(i);
2893
+            if (child == null)
2894
+                continue;
2895
+            child.GenNormalsMesh();
28272896 //            Children().release(i);
28282897         }
28292898         blockloop = false;
....@@ -2992,6 +3061,15 @@
29923061         if (bRep != null)
29933062         {
29943063             bRep.GenerateNormals(crease);
3064
+            Touch();
3065
+        }
3066
+    }
3067
+
3068
+    void GenNormalsMesh0()
3069
+    {
3070
+        if (bRep != null)
3071
+        {
3072
+            bRep.GenerateNormalsMesh();
29953073             Touch();
29963074         }
29973075     }
....@@ -3446,7 +3524,8 @@
34463524         if (blockloop)
34473525             return;
34483526         
3449
-        if (marked || (bRep != null && material != null)) // borderline...
3527
+        if (//marked || // does not make sense
3528
+                (bRep != null || material != null)) // borderline...
34503529             live = h;
34513530         
34523531         for (int i = 0; i < Size(); i++)
....@@ -3467,7 +3546,8 @@
34673546             return;
34683547         
34693548         //if (bRep != null)
3470
-        if (marked || (bRep != null && material != null)) // borderline...
3549
+        if (//marked || // does not make sense
3550
+                (bRep != null || material != null)) // borderline...
34713551             link2master = h;
34723552         
34733553         for (int i = 0; i < Size(); i++)
....@@ -3487,7 +3567,8 @@
34873567         if (blockloop)
34883568             return;
34893569         
3490
-        if (marked || (bRep != null && material != null)) // borderline...
3570
+        if (//marked || // does not make sense
3571
+                (bRep != null || material != null)) // borderline...
34913572             hide = h;
34923573         
34933574         for (int i = 0; i < Size(); i++)
....@@ -3507,7 +3588,7 @@
35073588         if (blockloop)
35083589             return;
35093590         
3510
-        if (bRep != null && material != null) // borderline...
3591
+        if (bRep != null || material != null) // borderline...
35113592             marked = h;
35123593         
35133594         for (int i = 0; i < Size(); i++)
....@@ -3517,6 +3598,46 @@
35173598                 continue;
35183599             blockloop = true;
35193600             child.MarkLeaves(h);
3601
+            blockloop = false;
3602
+         //   release(i);
3603
+        }
3604
+    }
3605
+    
3606
+    void RewindLeaves(boolean h)
3607
+    {
3608
+        if (blockloop)
3609
+            return;
3610
+        
3611
+        if (bRep != null || material != null) // borderline...
3612
+            rewind = h;
3613
+        
3614
+        for (int i = 0; i < Size(); i++)
3615
+        {
3616
+            Object3D child = (Object3D) get(i); // reserve(i);
3617
+            if (child == null)
3618
+                continue;
3619
+            blockloop = true;
3620
+            child.RewindLeaves(h);
3621
+            blockloop = false;
3622
+         //   release(i);
3623
+        }
3624
+    }
3625
+    
3626
+    void RandomLeaves(boolean h)
3627
+    {
3628
+        if (blockloop)
3629
+            return;
3630
+        
3631
+        if (bRep != null || material != null) // borderline...
3632
+            random = h;
3633
+        
3634
+        for (int i = 0; i < Size(); i++)
3635
+        {
3636
+            Object3D child = (Object3D) get(i); // reserve(i);
3637
+            if (child == null)
3638
+                continue;
3639
+            blockloop = true;
3640
+            child.RandomLeaves(h);
35203641             blockloop = false;
35213642          //   release(i);
35223643         }
....@@ -4294,6 +4415,55 @@
42944415         }
42954416     }
42964417     
4418
+    void RepairSOV()
4419
+    {
4420
+        if (blockloop)
4421
+            return;
4422
+
4423
+        String texname = this.GetPigmentTexture();
4424
+        
4425
+        if (texname.startsWith("sov"))
4426
+        {
4427
+            String[] s = texname.split("/");
4428
+
4429
+            String[] sname = s[1].split("Color.pn");
4430
+            
4431
+            texname = sname[0];
4432
+            
4433
+            if (sname.length > 1)
4434
+            {
4435
+                texname += "Color.jpg";
4436
+            }
4437
+            
4438
+            this.SetPigmentTexture("sov/" + texname);
4439
+        }
4440
+                
4441
+        texname = this.GetBumpTexture();
4442
+        
4443
+        if (texname.startsWith("sov"))
4444
+        {
4445
+            String[] s = texname.split("/");
4446
+
4447
+            String[] sname = s[1].split("Bump.pn");
4448
+            
4449
+            texname = sname[0];
4450
+            
4451
+            if (sname.length > 1)
4452
+            {
4453
+                texname += "Bump.jpg";
4454
+            }
4455
+            
4456
+            this.SetBumpTexture("sov/" + texname);
4457
+        }
4458
+                
4459
+        for (int i=0; i<Size(); i++)
4460
+        {               
4461
+                blockloop = true;
4462
+            get(i).RepairSOV();
4463
+                blockloop = false;
4464
+        }
4465
+    }
4466
+    
42974467     void RepairTexture()
42984468     {
42994469         if (this instanceof FileObject || blockloop)
....@@ -4808,6 +4978,14 @@
48084978         }
48094979     }
48104980     
4981
+    ObjEditor GetWindow()
4982
+    {
4983
+        if (editWindow != null)
4984
+            return editWindow;
4985
+        
4986
+        return manipWindow;
4987
+    }
4988
+    
48114989     cTreePath Select(int indexcount, boolean deselect)
48124990     {
48134991         if (hide || dontselect)
....@@ -4844,10 +5022,11 @@
48445022                 if (leaf != null)
48455023                 {
48465024                     cTreePath tp = new cTreePath(this, leaf);
4847
-                    if (editWindow != null)
5025
+                    ObjEditor window = GetWindow();
5026
+                    if (window != null)
48485027                     {
48495028                         //System.out.println("editWindow = " + editWindow + " vs " + this);
4850
-                        editWindow.Select(tp, deselect, true);
5029
+                        window.Select(tp, deselect, true);
48515030                     }
48525031 
48535032                     return tp;
....@@ -4873,9 +5052,10 @@
48735052                 if (leaf != null)
48745053                 {
48755054                     cTreePath tp = new cTreePath(this, leaf);
4876
-                    if (editWindow != null)
5055
+                    ObjEditor window = GetWindow();
5056
+                    if (window != null)
48775057                     {
4878
-                        editWindow.Select(tp, deselect, true);
5058
+                        window.Select(tp, deselect, true);
48795059                     }
48805060 
48815061                     return tp;
....@@ -5517,12 +5697,23 @@
55175697     boolean NeedSupport()
55185698     {
55195699         return
5520
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || !Globals.FREEZEONMOVE) && link2master && /*live &&*/ support != null
5700
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
55215701                  // PROBLEM with CROWD!!
55225702                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
55235703     }
55245704     
55255705     static boolean DEBUG_SELECTION = false;
5706
+    
5707
+    boolean IsLive()
5708
+    {
5709
+        if (live)
5710
+            return true;
5711
+        
5712
+        if (parent == null)
5713
+            return false;
5714
+        
5715
+        return parent.IsLive();
5716
+    }
55265717     
55275718     void Draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
55285719     {
....@@ -5585,7 +5776,7 @@
55855776             support = support;
55865777         
55875778         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5588
-        boolean usecalllists = false; // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5779
+        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
55895780         
55905781         if (!usecalllists && bRep != null && bRep.displaylist > 0)
55915782         {
....@@ -5605,10 +5796,12 @@
56055796         boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
56065797         
56075798         if (!selectmode && //display.DrawMode() != display.SELECTION &&
5608
-                (touched || (bRep != null && bRep.displaylist <= 0)))
5799
+                //(touched || (bRep != null && bRep.displaylist <= 0)))
5800
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
56095801         {
56105802             Globals.lighttouched = true;
56115803         } // all panes...
5804
+        
56125805         //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW &&
56135806         if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW &&
56145807                 (touched || (bRep != null && bRep.displaylist <= 0)))
....@@ -5776,16 +5969,27 @@
57765969         tex = GetTextures();
57775970     }
57785971 
5779
-    boolean failed = false;
5972
+    boolean failedPigment = false;
5973
+    boolean failedBump = false;
57805974     
57815975     try
57825976     {
5783
-        display.BindTextures(tex, texres);
5977
+        display.BindPigmentTexture(tex, texres);
57845978     }
57855979     catch (Exception e)
57865980     {
57875981         System.err.println("FAILED: " + this);
5788
-        failed = true;
5982
+        failedPigment = true;
5983
+    }
5984
+           
5985
+    try
5986
+    {
5987
+        display.BindBumpTexture(tex, texres);
5988
+    }
5989
+    catch (Exception e)
5990
+    {
5991
+        //System.err.println("FAILED: " + this);
5992
+        failedBump = true;
57895993     }
57905994            
57915995             if (!compiled)
....@@ -5808,8 +6012,11 @@
58086012                 }
58096013             }
58106014 
5811
-    if (!failed)
5812
-        display.ReleaseTextures(tex);
6015
+    if (!failedBump)
6016
+        display.ReleaseBumpTexture(tex);
6017
+
6018
+    if (!failedPigment)
6019
+        display.ReleasePigmentTexture(tex);
58136020 
58146021     display.PopMaterial(this, selected);
58156022         }
....@@ -6182,6 +6389,11 @@
61826389                 // dec 2012
61836390                 new Exception().printStackTrace();
61846391                 return;
6392
+            }
6393
+            
6394
+            if (dontselect)
6395
+            {
6396
+                //bRep.GenerateNormalsMINE();
61856397             }
61866398             
61876399             display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7034,7 +7246,7 @@
70347246             spot.translate(32, 32);
70357247             spotw = spot.x + spot.width;
70367248             spoth = spot.y + spot.height;
7037
-            info.g.setColor(Color.blue);
7249
+            info.g.setColor(Color.cyan);
70387250             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
70397251 //            if (CameraPane.Xmin > spot.x)
70407252 //            {
....@@ -7052,11 +7264,12 @@
70527264 //            {
70537265 //                CameraPane.Ymax = spoth;
70547266 //            }
7055
-            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - 15);
7056
-            //info.g.drawLine(spotw, spoth, spotw - 15, spoth);
7267
+            // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
7268
+            //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
70577269             spot.translate(0, -32);
7058
-            info.g.setColor(Color.green);
7270
+            info.g.setColor(Color.yellow);
70597271             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7272
+            info.g.setColor(Color.green);
70607273 //            if (CameraPane.Xmin > spot.x)
70617274 //            {
70627275 //                CameraPane.Xmin = spot.x;
....@@ -7374,19 +7587,20 @@
73747587                 switch (info.pane.RenderCamera().viewCode)
73757588                 {
73767589                     case 3: // '\001'
7377
-                        if (modified)
7590
+                        if (modified || opposite)
73787591                         {
73797592                             //LA.matScale(toParent, 1, hScale, vScale);
73807593                             LA.matScale(toParent, totalScale, 1, 1);
73817594                         } // vScale, 1);
73827595                         else
73837596                         {
7597
+                            // EXCEPTION!
73847598                             LA.matScale(toParent, totalScale, totalScale, totalScale);
73857599                         } // vScale, 1);
73867600                         break;
73877601 
73887602                     case 2: // '\002'
7389
-                        if (modified)
7603
+                        if (modified || opposite)
73907604                         {
73917605                             //LA.matScale(toParent, hScale, 1, vScale);
73927606                             LA.matScale(toParent, 1, totalScale, 1);
....@@ -7397,7 +7611,7 @@
73977611                         break;
73987612 
73997613                     case 1: // '\003'
7400
-                        if (modified)
7614
+                        if (modified || opposite)
74017615                         {
74027616                             //LA.matScale(toParent, hScale, vScale, 1);
74037617                             LA.matScale(toParent, 1, 1, totalScale);
....@@ -7617,6 +7831,10 @@
76177831             editWindow = null;
76187832         } // ?
76197833         }
7834
+        else
7835
+        {
7836
+            //editWindow.closeUI();
7837
+        }
76207838     }
76217839     
76227840     boolean root; // patch for edit windows
....@@ -7774,6 +7992,8 @@
77747992     }
77757993     
77767994     transient ObjEditor editWindow;
7995
+    transient ObjEditor manipWindow;
7996
+    
77777997     transient ObjectUI objectUI;
77787998     public static int povDepth = 0;
77797999     private static cVector tbMin = new cVector();