From f9325048496d7cdbcad233f8a6b84c88e79adcc2 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 17 Sep 2019 20:11:47 -0400
Subject: [PATCH] Rename link2master to link2support.
---
Composite.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Composite.java b/Composite.java
index 9244c31..32ee24c 100644
--- a/Composite.java
+++ b/Composite.java
@@ -279,11 +279,15 @@
Composite compo = new Composite();
- super.deepCopySelf(compo);
+ super.deepCopyNode(compo);
+
+ compo.count = 2;
for (int i = 0; i < Children().size(); i++)
{
Object3D obj = (Object3D) Children().reserve(i);
+ if (obj == null)
+ continue;
compo.addChild(obj.copyExpand());
Children().release(i);
}
@@ -293,9 +297,9 @@
return compo;
}
- protected void deepCopySelf(Object3D other)
+ protected void deepCopyNode(Object3D other)
{
- super.deepCopySelf(other);
+ super.deepCopyNode(other);
if (false)
{
@@ -401,7 +405,6 @@
{
child = (Object3D) e.nextElement();
}
-
}
void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
@@ -790,6 +793,8 @@
void draw(ClickInfo info, int level, boolean select)
{
+ new Exception().printStackTrace();
+
ClickInfo newInfo = new ClickInfo();
newInfo.flags = info.flags;
newInfo.bounds = info.bounds;
@@ -876,7 +881,7 @@
}
catch (Exception e)
{
- System.err.println("FAILED: " + this);
+ // System.err.println("FAILED: " + this);
failedPigment = true;
}
--
Gitblit v1.6.2