Fix ungroup.

Normand Briere

2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8

 CameraPane.java
..
..
@@ -335,14 +335,28 @@
335
335
                     display.options1[2] = material.shadowbias;
336
336
                     display.options1[3] = material.aniso;
337
337
                     display.options1[4] = material.anisoV;
338
+//                System.out.println("display.options1[0] " + display.options1[0]);
339
+//                System.out.println("display.options1[1] " + display.options1[1]);
340
+//                System.out.println("display.options1[2] " + display.options1[2]);
341
+//                System.out.println("display.options1[3] " + display.options1[3]);
342
+//                System.out.println("display.options1[4] " + display.options1[4]);
338
343
                     display.options2[0] = material.opacity;
339
344
                     display.options2[1] = material.diffuse;
340
345
                     display.options2[2] = material.factor;
346
+//                System.out.println("display.options2[0] " + display.options2[0]);
347
+//                System.out.println("display.options2[1] " + display.options2[1]);
348
+//                System.out.println("display.options2[2] " + display.options2[2]);
341
349
 
342
350
                     cColor.HSBtoRGB(material.color, material.modulation, 1, display.options3);
351
+//                System.out.println("display.options3[0] " + display.options3[0]);
352
+//                System.out.println("display.options3[1] " + display.options3[1]);
353
+//                System.out.println("display.options3[2] " + display.options3[2]);
343
354
                     display.options4[0] = material.cameralight/0.2f;
344
355
                     display.options4[1] = material.subsurface;
345
356
                     display.options4[2] = material.sheen;
357
+//                System.out.println("display.options4[0] " + display.options4[0]);
358
+//                System.out.println("display.options4[1] " + display.options4[1]);
359
+//                System.out.println("display.options4[2] " + display.options4[2]);
346
360
                     
347
361
                  //   if (display.CURRENTANTIALIAS > 0)
348
362
                  //       display.options3[3] /= 4;
..
..
@@ -9374,13 +9388,13 @@
9374
9388
     void ResetOptions()
9375
9389
     {
9376
9390
         options1[0] = 100;
9377
-        options1[1] = 0.00001f;
9378
-        options1[2] = 20;
9391
+        options1[1] = 0.025f;
9392
+        options1[2] = 0.01f;
9379
9393
         options1[3] = 0;
9380
9394
         options1[4] = 0;
9381
9395
         
9382
9396
         options2[0] = 0;
9383
-        options2[1] = 1;
9397
+        options2[1] = 0.75f;
9384
9398
         options2[2] = 0;
9385
9399
         options2[3] = 0;
9386
9400
         
..
..
@@ -13361,9 +13375,10 @@
13361
13375
                 "DP3 " + dest + ".z," + "normals," + "eye;" +
13362
13376
                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
13363
13377
                 //"MOV " + dest + ".w," + "normal.z;" +
13364
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13365
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13366
-                //"MOV " + dest + ".z," + "params2.w;" + 
13378
+//            "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13379
+//            "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13380
+                
13381
+                "MOV " + dest + ".z," + "params2.w;" + // EXACT
13367
13382
                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
13368
13383
                 "RCP " + dest + ".w," + dest + ".w;" +
13369
13384
                 //"RSQ " + dest + ".w," + dest + ".w;" +
..
..
@@ -15105,9 +15120,9 @@
15105
15120
             case '_':
15106
15121
                 kompactbit = 5;
15107
15122
                 break;
15108
-            case '+':
15109
-                kompactbit = 6;
15110
-                break;
15123
+//            case '+':
15124
+//                kompactbit = 6;
15125
+//                break;
15111
15126
             case ' ':
15112
15127
                 ObjEditor.theFrame.ToggleFullScreen();
15113
15128
                 repaint();
..
..
@@ -15156,8 +15171,8 @@
15156
15171
             case DELETE:
15157
15172
                 ClearSelection();
15158
15173
                 break;
15159
-                /*
15160
15174
             case '+':
15175
+                /*
15161
15176
                 //fontsize += 1;
15162
15177
                 bbzoom *= 2;
15163
15178
                 repaint();
..
..
@@ -16769,6 +16784,11 @@
16769
16784
                 //System.out.println("objects[color] = " + objects[color]);
16770
16785
                 //objects[color].Select();
16771
16786
                 indexcount = 0;
16787
+                    ObjEditor window = object.GetWindow();
16788
+                    if (window != null && deselect)
16789
+                    {
16790
+                        window.Select(null, deselect, true);
16791
+                    }
16772
16792
                 object.Select(color, deselect);
16773
16793
             }
16774
16794