From c8bb659043bfa0ccf9436d7cbbc49255b4c82402 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 03 Sep 2019 22:31:10 -0400
Subject: [PATCH] Paste expand.
---
RandomEditor.java | 5 ++---
CameraPane.java | 2 +-
GroupEditor.java | 6 ++++--
Object3D.java | 6 ++++--
Composite.java | 4 +++-
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 86fe7b8..f3a1537 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -14830,7 +14830,7 @@
}
PingThread pingthread = new PingThread();
int delta = 2;
- int speed = 10;
+ int speed = 5;
boolean autorepeat = false;
void GoDown(int mod)
diff --git a/Composite.java b/Composite.java
index 2b8dc5e..363d4ac 100644
--- a/Composite.java
+++ b/Composite.java
@@ -279,7 +279,9 @@
Composite compo = new Composite();
- super.deepCopySelf(compo);
+ super.deepCopyNode(compo);
+
+ compo.count = 2;
for (int i = 0; i < Children().size(); i++)
{
diff --git a/GroupEditor.java b/GroupEditor.java
index 5edd0f3..5f68a81 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -557,8 +557,10 @@
pasteLinkItem.addActionListener(this);
pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
pasteCloneItem.addActionListener(this);
-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
-// pasteExpandItem.addActionListener(this);
+// CRASH
+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
+//
+ pasteExpandItem.addActionListener(this);
//menu.add("-");
oe.jTree.popup.addSeparator();
diff --git a/Object3D.java b/Object3D.java
index 864faeb..f53b360 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -1303,8 +1303,10 @@
// will share the geometry
assert (!(this instanceof Composite));
- return deepCopy(); // Never called for Composite
-
+
+ Object3D obj = deepCopy(); // Never called for Composite
+ obj.count = 2;
+ return obj;
}
boolean HasLoops()
diff --git a/RandomEditor.java b/RandomEditor.java
index 747e799..cd30ede 100644
--- a/RandomEditor.java
+++ b/RandomEditor.java
@@ -141,9 +141,8 @@
itemField.setMinimum(0);
itemField.setMaximum(randomnode.Size() - 1);
itemField.setInteger(randomnode.rndIndex);
-
- itemField.validate();
- // objEditor.refreshContents();
+
+ // objEditor.refreshContents();
}
RandomNode randomnode;
--
Gitblit v1.6.2