From 26b49d8e26625491f4a407a05e9bc9d72037f938 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 17 Jun 2019 18:50:50 -0400
Subject: [PATCH] Global scale using X blue handle.
---
ObjEditor.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 747c30b..9cf4839 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -419,10 +419,10 @@
e.printStackTrace();
}
- String selection = infoarea.getText();
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
- java.awt.datatransfer.Clipboard clipboard =
- Toolkit.getDefaultToolkit().getSystemClipboard();
+// String selection = infoarea.getText();
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
+// java.awt.datatransfer.Clipboard clipboard =
+// Toolkit.getDefaultToolkit().getSystemClipboard();
//clipboard.setContents(data, data);
}
@@ -4295,6 +4295,7 @@
try
{
+ // Try compressed version first.
java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
@@ -4364,6 +4365,12 @@
void LoadIt(Object obj)
{
+ if (obj == null)
+ {
+ // Invalid file
+ return;
+ }
+
System.out.println("Loaded " + obj);
//new Exception().printStackTrace();
Object3D readobj = (Object3D) obj;
--
Gitblit v1.6.2