From dce400da7c65d659129abf9bc6e8f38b360a63d2 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 26 Aug 2019 20:13:01 -0400
Subject: [PATCH] Fix camera version + VR using spacebar.
---
Object3D.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 9d52cb0..b8c4bc0 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -194,6 +194,8 @@
{
Object3D o;
+ boolean isnew = false;
+
if (hashtable.containsKey(GetUUID()))
{
o = hashtable.get(GetUUID());
@@ -206,6 +208,8 @@
}
else
{
+ isnew = true;
+
o = new Object3D("copy of " + this.name);
hashtable.put(GetUUID(), o);
@@ -222,12 +226,15 @@
blockloop = false;
}
-
- ExtractBigData(o);
+
+ if (isnew)
+ ExtractBigData(o);
}
void ExtractBigData(Object3D o)
{
+ //System.err.println("ExtractBigData : " + this + " --> " + o);
+
if (o.bRep != null)
Grafreed.Assert(o.bRep == this.bRep);
@@ -238,8 +245,8 @@
// o.bRep.support = null;
// }
o.selection = this.selection;
- o.versionlist = this.versionlist;
- o.versionindex = this.versionindex;
+ //o.versionlist = this.versionlist;
+ //o.versionindex = this.versionindex;
if (this.support != null)
{
@@ -355,6 +362,8 @@
void RestoreBigData(Object3D o)
{
+ //System.err.println("RestoreBigData : " + this + " <-- " + o);
+
this.bRep = o.bRep;
if (this.support != null && o.transientrep != null)
{
@@ -363,8 +372,8 @@
this.selection = o.selection;
- this.versionlist = o.versionlist;
- this.versionindex = o.versionindex;
+ //this.versionlist = o.versionlist;
+ //this.versionindex = o.versionindex;
// July 2019 if (this.bRep != null)
// this.bRep.support = o.transientrep;
// this.support = o.support;
--
Gitblit v1.6.2