Normand Briere
2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2
Object3D.java
....@@ -100,7 +100,7 @@
100100 other.softtouched = softtouched;
101101
102102 other.random = random;
103
- other.link2master = link2master;
103
+ other.link2support = link2support;
104104 other.transformcount = transformcount;
105105 other.marked = marked;
106106 other.skip = skip;
....@@ -220,10 +220,10 @@
220220 return;
221221
222222 transientsupport = support;
223
- transientlink2master = link2master;
223
+ transientlink2master = link2support;
224224
225225 support = null;
226
- link2master = false;
226
+ link2support = false;
227227
228228 if (bRep != null)
229229 {
....@@ -247,7 +247,7 @@
247247 return;
248248
249249 support = transientsupport;
250
- link2master = transientlink2master;
250
+ link2support = transientlink2master;
251251 transientsupport = null;
252252 transientlink2master = false;
253253
....@@ -633,7 +633,7 @@
633633 transient boolean keepdontselect;
634634 boolean dontselect = false;
635635 boolean hide = false;
636
- boolean link2master = false; // performs reset support/master at each frame
636
+ boolean link2support = false; // performs reset support/master at each frame
637637 boolean marked = false; // animation node
638638 boolean skip = false; // centroid issue
639639 boolean skipmocap = false; // mocap data
....@@ -2202,7 +2202,7 @@
22022202 {
22032203 support = other;
22042204
2205
- link2master = support != null;
2205
+ link2support = support != null;
22062206
22072207 if (support != null && bRep.trimmed)
22082208 {
....@@ -3921,7 +3921,7 @@
39213921 //if (bRep != null)
39223922 if (//marked || // does not make sense
39233923 (bRep != null || material != null)) // borderline...
3924
- link2master = h;
3924
+ link2support = h;
39253925
39263926 for (int i = 0; i < Size(); i++)
39273927 {
....@@ -6159,7 +6159,7 @@
61596159 boolean NeedSupport()
61606160 {
61616161 return
6162
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
6162
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null
61636163 // PROBLEM with CROWD!!
61646164 && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
61656165 }
....@@ -6243,7 +6243,7 @@
62436243 support = support;
62446244
62456245 boolean usecalllists = !IsDynamic() &&
6246
- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6246
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2support); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
62476247 //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
62486248
62496249 //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -6350,7 +6350,7 @@
63506350 {
63516351 if (display.DrawMode() == iCameraPane.SHADOW)
63526352 {
6353
- if (!link2master // tricky to cull in shadow mode.
6353
+ if (!link2support // tricky to cull in shadow mode.
63546354 && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
63556355 {
63566356 //System.out.print("CULLED");