Skin shader + material panel fix.

Normand Briere

2019-08-17 ecc1309a04b527c62ffe97e814daf050dbd025cd

 Object3D.java
..
..
@@ -36,6 +36,8 @@
36
36
     Object3D versionlist[];
37
37
     int versionindex = -1;    
38
38
         
39
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
40
+    
39
41
     ScriptNode scriptnode;
40
42
 
41
43
         void InitOthers()
..
..
@@ -7417,7 +7419,7 @@
7417
7419
             boundary.y = spot.y - 30;
7418
7420
             boundary.width = spot.width + 60;
7419
7421
             boundary.height = spot.height + 60;
7420
-            clickInfo.g.setColor(Color.red);
7422
+            clickInfo.g.setColor(Color.white);
7421
7423
             int spotw = spot.x + spot.width;
7422
7424
             int spoth = spot.y + spot.height;
7423
7425
             clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
..
..
@@ -7818,21 +7820,27 @@
7818
7820
                     case 3: // '\001'
7819
7821
                         if (modified || opposite)
7820
7822
                         {
7823
+                            if (modified && opposite)
7824
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7825
+                            else
7821
7826
                             //LA.matScale(toParent, 1, hScale, vScale);
7822
-                            LA.matScale(toParent, totalScale, 1, 1);
7827
+                                LA.matScale(toParent, totalScale, 1, 1);
7823
7828
                         } // vScale, 1);
7824
7829
                         else
7825
7830
                         {
7826
7831
                             // EXCEPTION!
7827
-                            LA.matScale(toParent, totalScale, totalScale, totalScale);
7832
+                            LA.matScale(toParent, 1, totalScale, totalScale);
7828
7833
                         } // vScale, 1);
7829
7834
                         break;
7830
7835
 
7831
7836
                     case 2: // '\002'
7832
7837
                         if (modified || opposite)
7833
7838
                         {
7834
-                            //LA.matScale(toParent, hScale, 1, vScale);
7835
-                            LA.matScale(toParent, 1, totalScale, 1);
7839
+                            if (modified && opposite)
7840
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7841
+                            else
7842
+                                //LA.matScale(toParent, hScale, 1, vScale);
7843
+                                LA.matScale(toParent, 1, totalScale, 1);
7836
7844
                         } else
7837
7845
                         {
7838
7846
                             LA.matScale(toParent, totalScale, 1, totalScale);
..
..
@@ -7842,8 +7850,11 @@
7842
7850
                     case 1: // '\003'
7843
7851
                         if (modified || opposite)
7844
7852
                         {
7845
-                            //LA.matScale(toParent, hScale, vScale, 1);
7846
-                            LA.matScale(toParent, 1, 1, totalScale);
7853
+                            if (modified && opposite)
7854
+                                LA.matScale(toParent, totalScale, totalScale, totalScale);
7855
+                            else
7856
+                                //LA.matScale(toParent, hScale, vScale, 1);
7857
+                                LA.matScale(toParent, 1, 1, totalScale);
7847
7858
                         } else
7848
7859
                         {
7849
7860
                             LA.matScale(toParent, totalScale, totalScale, 1);