~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -116,11 +116,12 @@
116	116	{
117	117	int count = 0;
118	118
119		- for (int i = versionlist.length; --i >= 0;)
120		- {
121		- if (versionlist[i] != null)
122		- count++;
123		- }
	119	+ if (versionlist != null)
	120	+ for (int i = versionlist.length; --i >= 0;)
	121	+ {
	122	+ if (versionlist[i] != null)
	123	+ count++;
	124	+ }
124	125
125	126	return count;
126	127	}
..	..	@@ -6463,16 +6464,16 @@
6463	6464
6464	6465	assert (!(this instanceof Composite));
6465	6466	{
6466		- for (int i = 0; i < size(); i++)
6467		- {
6468		- Object3D child = (Object3D) reserve(i);
6469		- if (child == null)
6470		- continue;
6471		-
6472		- child.draw(display, root, selected, blocked);
6473		-
6474		- release(i);
6475		- }
	6467	+// CRASH MOCAP!! for (int i = 0; i < size(); i++)
	6468	+// {
	6469	+// Object3D child = (Object3D) reserve(i);
	6470	+// if (child == null)
	6471	+// continue;
	6472	+//
	6473	+// child.draw(display, root, selected, blocked);
	6474	+//
	6475	+// release(i);
	6476	+// }
6476	6477	}
6477	6478	}
6478	6479
..	..	@@ -8285,7 +8286,7 @@
8285	8286	// if (!Globals.ADVANCED)
8286	8287	// return objname;
8287	8288
8288		- return objname; // + " " + System.identityHashCode(this); // + GetUUID()
	8289	+ return objname; // + " " + System.identityHashCode(this) + " " + GetUUID();
8289	8290	}
8290	8291
8291	8292	public int hashCode()