tab index

Normand Briere

2019-09-30 3966454055db8e04700e881a091c2d33dcfda232

tab index

 CameraPane.java
..
..
@@ -14680,6 +14680,8 @@
14680
14680
 //                RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
14681
 //                RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
14682
                                  //       System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683
+                CreateSelectedPoint();
14684
+                
14683
14685
                 RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
14684
14686
                 RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
14685
14687
                 RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
 Cone.java
..
..
@@ -2,7 +2,8 @@
2
2
 
3
3
 class Cone extends Biparam implements java.io.Serializable
4
4
 {
5
-    static final long serialVersionUID = -2558098774090336324L; // -679715043452968126L;
5
+    static final long serialVersionUID = -2558098774090336324L; // new
6
+                                // -679715043452968126L; // old
6
7
 
7
8
     Cone()
8
9
     {
 GroupEditor.java
..
..
@@ -5417,6 +5417,10 @@
5417
5417
                             
5418
5418
                         if (tps != null && tps.length == 1)
5419
5419
                         {
5420
+                            int tabIndex = ((Object3D)group.selection.elementAt(0)).tabIndex;
5421
+                            if (tabIndex > 0)
5422
+                                objectTabbedPane.setSelectedIndex(tabIndex-1);
5423
+                            
5420
5424
                             EditSelection(false);
5421
5425
                         }
5422
5426
                         
 ObjEditor.java
..
..
@@ -560,6 +560,11 @@
560
560
 //                }
561
561
                 cameraView.transformMode = objectTabbedPane.getSelectedIndex() == transformTabIndex;
562
562
                 
563
+                if (copy.selection.size() == 1)
564
+                {
565
+                    copy.selection.get(0).tabIndex = objectTabbedPane.getSelectedIndex() + 1;
566
+                }
567
+                
563
568
 //                refreshContents(false); // To refresh Info tab
564
569
                 cameraView.repaint();
565
570
             }
 Object3D.java
..
..
@@ -41,6 +41,8 @@
41
41
         
42
42
     java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
43
43
     
44
+    int tabIndex;
45
+    
44
46
     ScriptNode scriptnode;
45
47
 
46
48
     void deepCopyNode(Object3D other)
 ParticleNode.java
..
..
@@ -353,7 +353,7 @@
353
353
         
354
354
         Object3D geo = test;
355
355
         
356
-        if (support != null && link2master)
356
+        if (support != null && Link2Support())
357
357
             geo = support;
358
358
         
359
359
         if (live && Globals.isLIVE() && (display.DrawMode() == display.SHADOW || !Globals.RENDERSHADOW)) // june 2013