From 59de607850161a26863f92961d53caae7a2dabc8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 06 Aug 2019 21:37:03 -0400
Subject: [PATCH] Pin button.
---
Object3D.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index f760249..adb076e 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -22,6 +22,7 @@
//static final long serialVersionUID = -607422624994562685L;
static final long serialVersionUID = 5022536242724664900L;
+ // Use GetUUID for backward compatibility with null.
private UUID uuid = UUID.randomUUID();
// TEMPORARY for mocap undo. No need to be transient.
@@ -32,7 +33,7 @@
String skyboxname;
String skyboxext;
- byte[] versions[];
+ Object3D versionlist[];
int versionindex = -1;
ScriptNode scriptnode;
@@ -222,7 +223,7 @@
// o.bRep.support = null;
// }
o.selection = this.selection;
- o.versions = this.versions;
+ o.versionlist = this.versionlist;
o.versionindex = this.versionindex;
if (this.support != null)
@@ -245,6 +246,29 @@
// this.support = null;
// this.fileparent = null;
}
+
+// Object3D GetObject(java.util.UUID uuid)
+// {
+// if (this.uuid.equals(uuid))
+// return this;
+//
+// if (blockloop)
+// return null;
+//
+// blockloop = true;
+//
+// for (int i=0; i<Size(); i++)
+// {
+// Object3D o = get(i).GetObject(uuid);
+//
+// if (o != null)
+// return o;
+// }
+//
+// blockloop = false;
+//
+// return null;
+// }
void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
{
@@ -280,7 +304,7 @@
this.selection = o.selection;
- this.versions = o.versions;
+ this.versionlist = o.versionlist;
this.versionindex = o.versionindex;
// July 2019 if (this.bRep != null)
// this.bRep.support = o.transientrep;
@@ -2444,6 +2468,7 @@
else
{
//((ObjEditor)editWindow).SetupUI2(null);
+ ((ObjEditor)objectUI).pinButton.setSelected(pinned);
}
}
--
Gitblit v1.6.2