From f2460bf93a1ff85a36407da2c599808e9e7a7091 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 04 Sep 2019 22:33:41 -0400
Subject: [PATCH] Fix cameras and new.
---
Object3D.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index f53b360..7209513 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -116,11 +116,12 @@
{
int count = 0;
- for (int i = versionlist.length; --i >= 0;)
- {
- if (versionlist[i] != null)
- count++;
- }
+ if (versionlist != null)
+ for (int i = versionlist.length; --i >= 0;)
+ {
+ if (versionlist[i] != null)
+ count++;
+ }
return count;
}
@@ -6463,16 +6464,16 @@
assert (!(this instanceof Composite));
{
- for (int i = 0; i < size(); i++)
- {
- Object3D child = (Object3D) reserve(i);
- if (child == null)
- continue;
-
- child.draw(display, root, selected, blocked);
-
- release(i);
- }
+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
+// {
+// Object3D child = (Object3D) reserve(i);
+// if (child == null)
+// continue;
+//
+// child.draw(display, root, selected, blocked);
+//
+// release(i);
+// }
}
}
@@ -8285,7 +8286,7 @@
// if (!Globals.ADVANCED)
// return objname;
- return objname; // + " " + System.identityHashCode(this); // + GetUUID()
+ return objname; // + " " + System.identityHashCode(this) + " " + GetUUID();
}
public int hashCode()
--
Gitblit v1.6.2