.. | .. |
---|
881 | 881 | |
---|
882 | 882 | if (marked && Globals.isLIVE() && live && |
---|
883 | 883 | //TEMP21aug2018 |
---|
884 | | - (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW) && |
---|
| 884 | + (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) && |
---|
885 | 885 | currentframe != Globals.framecount) |
---|
886 | 886 | { |
---|
887 | 887 | currentframe = Globals.framecount; |
---|
.. | .. |
---|
966 | 966 | if (material == null || material.multiply) |
---|
967 | 967 | return true; |
---|
968 | 968 | |
---|
| 969 | + // Transparent objects are dynamic because we have to sort the triangles. |
---|
969 | 970 | return material.opacity > 0.99; |
---|
970 | 971 | } |
---|
971 | 972 | |
---|
.. | .. |
---|
2386 | 2387 | editWindow.show(); |
---|
2387 | 2388 | } |
---|
2388 | 2389 | */ |
---|
| 2390 | + } |
---|
| 2391 | + else |
---|
| 2392 | + { |
---|
| 2393 | + //((ObjEditor)editWindow).SetupUI2(null); |
---|
2389 | 2394 | } |
---|
2390 | 2395 | } |
---|
2391 | 2396 | |
---|
.. | .. |
---|
5746 | 5751 | support = support; |
---|
5747 | 5752 | |
---|
5748 | 5753 | //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); |
---|
5750 | 5755 | |
---|
5751 | 5756 | if (!usecalllists && bRep != null && bRep.displaylist > 0) |
---|
5752 | 5757 | { |
---|
.. | .. |
---|
5767 | 5772 | |
---|
5768 | 5773 | if (!selectmode && //display.DrawMode() != display.SELECTION && |
---|
5769 | 5774 | //(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))) |
---|
5771 | 5776 | { |
---|
5772 | 5777 | Globals.lighttouched = true; |
---|
5773 | 5778 | } // all panes... |
---|
.. | .. |
---|
6359 | 6364 | // dec 2012 |
---|
6360 | 6365 | new Exception().printStackTrace(); |
---|
6361 | 6366 | return; |
---|
| 6367 | + } |
---|
| 6368 | + |
---|
| 6369 | + if (dontselect) |
---|
| 6370 | + { |
---|
| 6371 | + //bRep.GenerateNormalsMINE(); |
---|
6362 | 6372 | } |
---|
6363 | 6373 | |
---|
6364 | 6374 | display.DrawGeometry(bRep, flipV, selectmode); |
---|
.. | .. |
---|
7796 | 7806 | editWindow = null; |
---|
7797 | 7807 | } // ? |
---|
7798 | 7808 | } |
---|
| 7809 | + else |
---|
| 7810 | + { |
---|
| 7811 | + //editWindow.closeUI(); |
---|
| 7812 | + } |
---|
7799 | 7813 | } |
---|
7800 | 7814 | |
---|
7801 | 7815 | boolean root; // patch for edit windows |
---|