From 68e51d528bbddd9f611836d676c8773042ee845a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 21 Sep 2019 19:45:46 -0400
Subject: [PATCH] Rename back link2master
---
Object3D.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 24c90ab..ba7e5c6 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -100,7 +100,7 @@
other.softtouched = softtouched;
other.random = random;
- other.link2support = link2support;
+ other.link2master = link2master;
other.transformcount = transformcount;
other.marked = marked;
other.skip = skip;
@@ -220,10 +220,10 @@
return;
transientsupport = support;
- transientlink2master = link2support;
+ transientlink2master = link2master;
support = null;
- link2support = false;
+ link2master = false;
if (bRep != null)
{
@@ -247,7 +247,7 @@
return;
support = transientsupport;
- link2support = transientlink2master;
+ link2master = transientlink2master;
transientsupport = null;
transientlink2master = false;
@@ -633,7 +633,7 @@
transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
- boolean link2support = false; // performs reset support/master at each frame
+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
boolean marked = false; // animation node
boolean skip = false; // centroid issue
boolean skipmocap = false; // mocap data
@@ -2202,7 +2202,7 @@
{
support = other;
- link2support = support != null;
+ link2master = support != null;
if (support != null && bRep.trimmed)
{
@@ -3921,7 +3921,7 @@
//if (bRep != null)
if (//marked || // does not make sense
(bRep != null || material != null)) // borderline...
- link2support = h;
+ link2master = h;
for (int i = 0; i < Size(); i++)
{
@@ -6159,7 +6159,7 @@
boolean NeedSupport()
{
return
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
// PROBLEM with CROWD!!
&& (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
}
@@ -6243,7 +6243,7 @@
support = support;
boolean usecalllists = !IsDynamic() &&
- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2support); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
@@ -6350,7 +6350,7 @@
{
if (display.DrawMode() == iCameraPane.SHADOW)
{
- if (!link2support // tricky to cull in shadow mode.
+ if (!link2master // tricky to cull in shadow mode.
&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
{
//System.out.print("CULLED");
@@ -8894,7 +8894,7 @@
boolean touch = false;
- if (bRep != null && link2support)
+ if (bRep != null && link2master)
{
if (bbox == null)
{
--
Gitblit v1.6.2