Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253
Object3D.java
....@@ -881,7 +881,7 @@
881881
882882 if (marked && Globals.isLIVE() && live &&
883883 //TEMP21aug2018
884
- (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) &&
884
+ (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
885885 currentframe != Globals.framecount)
886886 {
887887 currentframe = Globals.framecount;
....@@ -966,6 +966,7 @@
966966 if (material == null || material.multiply)
967967 return true;
968968
969
+ // Transparent objects are dynamic because we have to sort the triangles.
969970 return material.opacity > 0.99;
970971 }
971972
....@@ -2386,6 +2387,10 @@
23862387 editWindow.show();
23872388 }
23882389 */
2390
+ }
2391
+ else
2392
+ {
2393
+ //((ObjEditor)editWindow).SetupUI2(null);
23892394 }
23902395 }
23912396
....@@ -5746,7 +5751,7 @@
57465751 support = support;
57475752
57485753 //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5749
- boolean usecalllists = IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5754
+ boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
57505755
57515756 if (!usecalllists && bRep != null && bRep.displaylist > 0)
57525757 {
....@@ -5767,7 +5772,7 @@
57675772
57685773 if (!selectmode && //display.DrawMode() != display.SELECTION &&
57695774 //(touched || (bRep != null && bRep.displaylist <= 0)))
5770
- (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))
5775
+ (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && (bRep != null && bRep.displaylist <= 0)))
57715776 {
57725777 Globals.lighttouched = true;
57735778 } // all panes...
....@@ -6359,6 +6364,11 @@
63596364 // dec 2012
63606365 new Exception().printStackTrace();
63616366 return;
6367
+ }
6368
+
6369
+ if (dontselect)
6370
+ {
6371
+ //bRep.GenerateNormalsMINE();
63626372 }
63636373
63646374 display.DrawGeometry(bRep, flipV, selectmode);
....@@ -7796,6 +7806,10 @@
77967806 editWindow = null;
77977807 } // ?
77987808 }
7809
+ else
7810
+ {
7811
+ //editWindow.closeUI();
7812
+ }
77997813 }
78007814
78017815 boolean root; // patch for edit windows