Normand Briere
2019-10-06 9cf2c36d644d0aaa28797f57a3e71591d8e66973
Object3D.java
....@@ -41,7 +41,7 @@
4141
4242 java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
4343
44
- int tabIndex;
44
+ transient int tabIndex; // Tabs can change between sessions.
4545
4646 ScriptNode scriptnode;
4747
....@@ -1142,6 +1142,8 @@
11421142 (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
11431143 currentframe != Globals.framecount)
11441144 {
1145
+ Globals.lighttouched = true;
1146
+
11451147 currentframe = Globals.framecount;
11461148
11471149 // System.err.println("transformcount = " + transformcount);
....@@ -3419,7 +3421,7 @@
34193421 }
34203422 }
34213423
3422
- public void Scale(int scale)
3424
+ public void Scale(float scale)
34233425 {
34243426 Object3D obj = this;
34253427
....@@ -6301,7 +6303,7 @@
63016303
63026304 if (!selectmode && //display.DrawMode() != display.SELECTION &&
63036305 //(touched || (bRep != null && bRep.displaylist <= 0)))
6304
- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
6306
+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
63056307 {
63066308 Globals.lighttouched = true;
63076309 } // all panes...
....@@ -6856,7 +6858,8 @@
68566858
68576859 //javax.media.opengl.GL gl = display.GetGL();
68586860
6859
- if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
6861
+ if (CameraPane.BOXMODE && //!Link2Support()) //
6862
+ !selected) // || CameraPane.movingcamera)
68606863 {
68616864 int fc = bRep.FaceCount();
68626865 int vc = bRep.VertexCount();