Fix "+" issue

Normand Briere

2019-06-09 3ae9b1de47e51e7c150412f2bb14383cb6a5f8f8

 ObjEditor.java
..
..
@@ -501,13 +501,13 @@
501
501
         //SendInfo("Name:", "bold");
502
502
         if (sel.GetTextures() != null || debug)
503
503
         {
504
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505
505
             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506
506
             if (sel.Size() > 0)
507
507
             {
508
508
                 si.SendInfo("#children = " + sel.Size(), "regular");
509
509
             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511
511
             if (debug)
512
512
             {
513
513
                 try
..
..
@@ -549,7 +549,7 @@
549
549
                 }
550
550
                 if (sel.support != null)
551
551
                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553
553
                 }
554
554
                 if (sel.scriptnode != null)
555
555
                 {
..
..
@@ -784,6 +784,7 @@
784
784
 //    NumberSlider vDivsField;
785
785
 //    JCheckBox endcaps;
786
786
     JCheckBox liveCB;
787
+    JCheckBox selectCB;
787
788
     JCheckBox hideCB;
788
789
     JCheckBox link2masterCB;
789
790
     JCheckBox markCB;
..
..
@@ -986,9 +987,11 @@
986
987
             
987
988
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988
989
                 liveCB.setToolTipText("Animate object");
990
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991
+                selectCB.setToolTipText("Make object selectable");
992
+//            Return();
989
993
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990
994
                 hideCB.setToolTipText("Hide object");
991
-//            Return();
992
995
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993
996
         markCB.setToolTipText("Set the animation target transform");
994
997
         
..
..
@@ -1028,7 +1031,7 @@
1028
1031
         oe.ctrlPanel.add(commandsPanel);
1029
1032
         oe.ctrlPanel.Return();
1030
1033
 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1034
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032
1035
     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033
1036
     //Return();
1034
1037
 
..
..
@@ -3007,6 +3010,10 @@
3007
3010
         {
3008
3011
             copy.live ^= true;
3009
3012
             return;
3013
+        } else if (event.getSource() == selectCB)
3014
+        {
3015
+            copy.dontselect ^= true;
3016
+            return;
3010
3017
         } else if (event.getSource() == hideCB)
3011
3018
         {
3012
3019
             copy.hide ^= true;
..
..
@@ -3588,7 +3595,7 @@
3588
3595
         }
3589
3596
         
3590
3597
         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3598
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3592
3599
     }
3593
3600
 
3594
3601
         void SnapObject()