Globals.java | ●●●●● patch | view | raw | blame | history | |
ObjEditor.java | ●●●●● patch | view | raw | blame | history | |
Object3D.java | ●●●●● patch | view | raw | blame | history |
Globals.java
.. .. @@ -8,6 +8,8 @@ 8 8 private static boolean LIVE = false; 9 9 public static boolean RENDERSHADOW = true; 10 10 11 + public static boolean MOUSEDRAGGED = false;12 +11 13 // Hold on calculation when moving camera 12 14 public static boolean FREEZEONMOVE = false; // true; 13 15 ObjEditor.java
.. .. @@ -419,10 +419,10 @@ 419 419 e.printStackTrace(); 420 420 } 421 421 422 - String selection = infoarea.getText();423 - java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);424 - java.awt.datatransfer.Clipboard clipboard =425 - Toolkit.getDefaultToolkit().getSystemClipboard();422 +// String selection = infoarea.getText();423 +// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);424 +// java.awt.datatransfer.Clipboard clipboard =425 +// Toolkit.getDefaultToolkit().getSystemClipboard();426 426 //clipboard.setContents(data, data); 427 427 } 428 428 .. .. @@ -4295,6 +4295,7 @@ 4295 4295 4296 4296 try 4297 4297 { 4298 + // Try compressed version first.4298 4299 java.io.FileInputStream istream = new java.io.FileInputStream(fullname); 4299 4300 java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream); 4300 4301 java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream); .. .. @@ -4364,6 +4365,12 @@ 4364 4365 4365 4366 void LoadIt(Object obj) 4366 4367 { 4368 + if (obj == null)4369 + {4370 + // Invalid file4371 + return;4372 + }4373 +4367 4374 System.out.println("Loaded " + obj); 4368 4375 //new Exception().printStackTrace(); 4369 4376 Object3D readobj = (Object3D) obj; Object3D.java
.. .. @@ -5673,10 +5673,12 @@ 5673 5673 boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection(); 5674 5674 5675 5675 if (!selectmode && //display.DrawMode() != display.SELECTION && 5676 - (touched || (bRep != null && bRep.displaylist <= 0)))5676 + //(touched || (bRep != null && bRep.displaylist <= 0)))5677 + (Globals.isLIVE() || touched && (bRep != null && bRep.displaylist <= 0)))5677 5678 { 5678 5679 Globals.lighttouched = true; 5679 5680 } // all panes... 5681 +5680 5682 //if (usecalllists && display.DrawMode() != display.SELECTION && display.DrawMode() != display.SHADOW && 5681 5683 if (bRep != null && usecalllists && !selectmode && // june 2013 display.DrawMode() != display.SHADOW && 5682 5684 (touched || (bRep != null && bRep.displaylist <= 0)))