From 3966454055db8e04700e881a091c2d33dcfda232 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 30 Sep 2019 19:22:19 -0400
Subject: [PATCH] tab index
---
ObjEditor.java | 5 +++++
Cone.java | 3 ++-
CameraPane.java | 2 ++
GroupEditor.java | 4 ++++
ParticleNode.java | 2 +-
Object3D.java | 2 ++
6 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 33efbcd..48170cc 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -14680,6 +14680,8 @@
// RigidBody.pos.y = (float)manipCamera.lookAt.y;
// RigidBody.pos.z = (float)manipCamera.lookAt.z;
// System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
+ CreateSelectedPoint();
+
RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
diff --git a/Cone.java b/Cone.java
index 490678a..d0d4c5c 100644
--- a/Cone.java
+++ b/Cone.java
@@ -2,7 +2,8 @@
class Cone extends Biparam implements java.io.Serializable
{
- static final long serialVersionUID = -2558098774090336324L; // -679715043452968126L;
+ static final long serialVersionUID = -2558098774090336324L; // new
+ // -679715043452968126L; // old
Cone()
{
diff --git a/GroupEditor.java b/GroupEditor.java
index 0ef6314..949d4b1 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -5417,6 +5417,10 @@
if (tps != null && tps.length == 1)
{
+ int tabIndex = ((Object3D)group.selection.elementAt(0)).tabIndex;
+ if (tabIndex > 0)
+ objectTabbedPane.setSelectedIndex(tabIndex-1);
+
EditSelection(false);
}
diff --git a/ObjEditor.java b/ObjEditor.java
index 216b8ba..ed17507 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -560,6 +560,11 @@
// }
cameraView.transformMode = objectTabbedPane.getSelectedIndex() == transformTabIndex;
+ if (copy.selection.size() == 1)
+ {
+ copy.selection.get(0).tabIndex = objectTabbedPane.getSelectedIndex() + 1;
+ }
+
// refreshContents(false); // To refresh Info tab
cameraView.repaint();
}
diff --git a/Object3D.java b/Object3D.java
index 0bb1b02..7a66915 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -41,6 +41,8 @@
java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
+ int tabIndex;
+
ScriptNode scriptnode;
void deepCopyNode(Object3D other)
diff --git a/ParticleNode.java b/ParticleNode.java
index ffb1d1f..7206b80 100644
--- a/ParticleNode.java
+++ b/ParticleNode.java
@@ -353,7 +353,7 @@
Object3D geo = test;
- if (support != null && link2master)
+ if (support != null && Link2Support())
geo = support;
if (live && Globals.isLIVE() && (display.DrawMode() == display.SHADOW || !Globals.RENDERSHADOW)) // june 2013
--
Gitblit v1.6.2