blame | history | patch | commit | commitdiff
Normand Briere
2019-07-20 0a52bd4800459cd9935f360d7ca9555b6bea2146 
 CameraPane.java
....@@ -335,14 +335,28 @@
335335                     display.options1[2] = material.shadowbias;
336336                     display.options1[3] = material.aniso;
337337                     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]);
338343                     display.options2[0] = material.opacity;
339344                     display.options2[1] = material.diffuse;
340345                     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]);
341349 
342350                     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]);
343354                     display.options4[0] = material.cameralight/0.2f;
344355                     display.options4[1] = material.subsurface;
345356                     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]);
346360                     
347361                  //   if (display.CURRENTANTIALIAS > 0)
348362                  //       display.options3[3] /= 4;
....@@ -2051,7 +2065,7 @@
20512065             //System.err.println("Oeil on");
20522066             OEIL = true;
20532067             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
2054
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
2068
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
20552069             //pingthread.StepToTarget(true);
20562070         }
20572071         
....@@ -2284,10 +2298,17 @@
22842298         HANDLES ^= true;
22852299     }
22862300 
2301
+    Object3D paintFolder;
2302
+    
22872303     void TogglePaint()
22882304     {
22892305         PAINTMODE ^= true;
22902306         paintcount = 0;
2307
+        
2308
+        if (PAINTMODE)
2309
+        {
2310
+            paintFolder = GetFolder();
2311
+        }
22912312     }
22922313 
22932314     void SwapCamera(int a, int b)
....@@ -8489,7 +8510,7 @@
84898510         return texture!=null?texture.texturedata:null;
84908511     }
84918512     
8492
-    boolean BindTexture(String tex, boolean bump, int resolution) throws Exception
8513
+    com.sun.opengl.util.texture.Texture BindTexture(String tex, boolean bump, int resolution) throws Exception
84938514     {
84948515         if (/*tex == null ||*/ ambientOcclusion ) // || !textureon)
84958516         {
....@@ -8501,7 +8522,7 @@
85018522         com.sun.opengl.util.texture.Texture texture = GetTexture(tex, bump, resolution);
85028523 
85038524         if (texture == null)
8504
-            return false;
8525
+            return texture;
85058526         /**/
85068527 
85078528         if (textureon || tex.equals("DEFAULT_TEXTURE") || tex.equals("DEFAULT_TEXTURE_BUMP") || tex.equals("WHITE_NOISE")) // || tex.equals("IMMORTAL"))
....@@ -9366,11 +9387,35 @@
93669387         jy8[3] = 0.5f;
93679388     }
93689389     
9369
-    float[] options1 = new float[]{1000, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
9390
+    float[] options1 = new float[]{100, 0.00001f, 20, 0, 0}; // focus, aperture, Shadow blur, aniso, anisoV
93709391     float[] options2 = new float[]{0, 1, 0, 0}; // fog density, intensity, elevation
93719392     float[] options3 = new float[]{1, 1, 1, 0}; // fog color
93729393     float[] options4 = new float[]{1, 0, 1, 0}; // image intensity, subsurface, lightsheen
93739394 
9395
+    void ResetOptions()
9396
+    {
9397
+        options1[0] = 100;
9398
+        options1[1] = 0.025f;
9399
+        options1[2] = 0.01f;
9400
+        options1[3] = 0;
9401
+        options1[4] = 0;
9402
+        
9403
+        options2[0] = 0;
9404
+        options2[1] = 0.75f;
9405
+        options2[2] = 0;
9406
+        options2[3] = 0;
9407
+        
9408
+        options3[0] = 1;
9409
+        options3[1] = 1;
9410
+        options3[2] = 1;
9411
+        options3[3] = 0;
9412
+        
9413
+        options4[0] = 1;
9414
+        options4[1] = 0;
9415
+        options4[2] = 1;
9416
+        options4[3] = 0;
9417
+    }
9418
+    
93749419     static int imagecount = 0; // movie generation
93759420     
93769421     static int jitter = 0;
....@@ -10990,9 +11035,9 @@
1099011035 
1099111036             gl.glMatrixMode(GL.GL_MODELVIEW);
1099211037 
10993
-//gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
10994
-//gl.glEnable(gl.GL_POLYGON_SMOOTH);
10995
-//gl.glEnable(gl.GL_MULTISAMPLE);
11038
+gl.glEnable(gl.GL_POLYGON_SMOOTH);
11039
+gl.glHint(gl.GL_POLYGON_SMOOTH_HINT, gl.GL_NICEST);
11040
+gl.glEnable(gl.GL_MULTISAMPLE);
1099611041         } else
1099711042         {
1099811043             //gl.glDisable(GL.GL_TEXTURE_2D);
....@@ -11003,7 +11048,7 @@
1100311048         //System.out.println("BLENDING ON");
1100411049         gl.glEnable(GL.GL_BLEND);
1100511050         gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
11006
-
11051
+//        gl.glBlendFunc(GL.GL_SRC_ALPHA_SATURATE, GL.GL_ONE);
1100711052         gl.glMatrixMode(gl.GL_PROJECTION);
1100811053         gl.glLoadIdentity();
1100911054 
....@@ -11480,13 +11525,16 @@
1148011525     
1148111526     void DrawObject(GL gl, boolean draw)
1148211527     {
11528
+        // To clear camera values
11529
+        ResetOptions();
11530
+        
1148311531         //System.out.println("DRAW OBJECT " + mouseDown);
1148411532 //        DrawMode() = SELECTION;
1148511533         //GL gl = getGL();
1148611534         if ((TRACK || SHADOWTRACK) || zoomonce)
1148711535         {
1148811536             if ((TRACK || SHADOWTRACK) && trackedobject != null && DrawMode() == SHADOW) // && !lightMode)
11489
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
11537
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1149011538             pingthread.StepToTarget(true); // true);
1149111539        //     zoomonce = false;
1149211540         }
....@@ -12047,7 +12095,7 @@
1204712095             for (int i = tp.size(); --i >= 0;)
1204812096             {
1204912097                 //for (int count = tp.get(i).GetTransformCount(); --count>=0;)
12050
-                    LA.xformPos(light, tp.get(i).GlobalTransform(), light);
12098
+                    LA.xformPos(light, tp.get(i).GlobalTransformInv(), light);
1205112099             }
1205212100 
1205312101 
....@@ -13334,9 +13382,10 @@
1333413382                 "DP3 " + dest + ".z," + "normals," + "eye;" +
1333513383                 "MAX " + dest + ".w," + dest + ".z," + "eps.x;" +
1333613384                 //"MOV " + dest + ".w," + "normal.z;" +
13337
-                "MUL " + dest + ".z," + "params2.w," + dest + ".x;" +
13338
-                "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13339
-                //"MOV " + dest + ".z," + "params2.w;" + 
13385
+//            "MUL " + dest + ".z," + "params2.w," + dest + ".x;" + // PRETTY HEURISTIC FOR VELVET
13386
+//            "MUL " + dest + ".z," + dest + ".z," + dest + ".x;" +
13387
+                
13388
+                "MOV " + dest + ".z," + "params2.w;" + // EXACT
1334013389                 "POW " + dest + ".w," + dest + ".w," + dest + ".z;" +
1334113390                 "RCP " + dest + ".w," + dest + ".w;" +
1334213391                 //"RSQ " + dest + ".w," + dest + ".w;" +
....@@ -13901,7 +13950,7 @@
1390113950             
1390213951 // fev 2014???
1390313952             if ((TRACK || SHADOWTRACK) && trackedobject != null) // && DrawMode() == SHADOW) // && !lightMode)
13904
-                object.editWindow.ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
13953
+                object.GetWindow().ScreenFit(trackedobject, SHADOWTRACK && !TRACK);
1390513954             pingthread.StepToTarget(true); // true);
1390613955         }
1390713956     //    if (!LIVE)
....@@ -14255,12 +14304,12 @@
1425514304     void GoDown(int mod)
1425614305     {
1425714306         MODIFIERS |= COMMAND;
14258
-        /*
14307
+        /**/
1425914308         if((mod&SHIFT) == SHIFT)
1426014309         manipCamera.RotatePosition(0, -speed);
1426114310         else
14262
-        manipCamera.BackForth(0, -speed*delta, getWidth());
14263
-         */
14311
+        manipCamera.BackForth(0, -speed*delta, 0); // getWidth());
14312
+        /**/
1426414313         if ((mod & SHIFT) == SHIFT)
1426514314         {
1426614315             mouseMode = mouseMode; // VR??
....@@ -14276,12 +14325,12 @@
1427614325     void GoUp(int mod)
1427714326     {
1427814327         MODIFIERS |= COMMAND;
14279
-        /*
14328
+        /**/
1428014329         if((mod&SHIFT) == SHIFT)
1428114330         manipCamera.RotatePosition(0, speed);
1428214331         else
14283
-        manipCamera.BackForth(0, speed*delta, getWidth());
14284
-         */
14332
+        manipCamera.BackForth(0, speed*delta, 0); // getWidth());
14333
+        /**/
1428514334         if ((mod & SHIFT) == SHIFT)
1428614335         {
1428714336             mouseMode = mouseMode;
....@@ -14297,12 +14346,12 @@
1429714346     void GoLeft(int mod)
1429814347     {
1429914348         MODIFIERS |= COMMAND;
14300
-        /*
14349
+        /**/
1430114350         if((mod&SHIFT) == SHIFT)
14302
-        manipCamera.RotatePosition(speed, 0);
14303
-        else
1430414351         manipCamera.Translate(speed*delta, 0, getWidth());
14305
-         */
14352
+        else
14353
+        manipCamera.RotatePosition(speed, 0);
14354
+        /**/
1430614355         if ((mod & SHIFT) == SHIFT)
1430714356         {
1430814357             mouseMode = mouseMode;
....@@ -14318,12 +14367,12 @@
1431814367     void GoRight(int mod)
1431914368     {
1432014369         MODIFIERS |= COMMAND;
14321
-        /*
14370
+        /**/
1432214371         if((mod&SHIFT) == SHIFT)
14323
-        manipCamera.RotatePosition(-speed, 0);
14324
-        else
1432514372         manipCamera.Translate(-speed*delta, 0, getWidth());
14326
-         */
14373
+        else
14374
+        manipCamera.RotatePosition(-speed, 0);
14375
+        /**/
1432714376         if ((mod & SHIFT) == SHIFT)
1432814377         {
1432914378             mouseMode = mouseMode;
....@@ -14562,7 +14611,8 @@
1456214611         Globals.MOUSEDRAGGED = false;
1456314612         
1456414613         movingcamera = false;
14565
-        X = Y = 0;
14614
+        X = 0; // getBounds().width/2;
14615
+        Y = 0; // getBounds().height/2;
1456614616         //System.out.println("mouseReleased: " + e);
1456714617         clickEnd(e.getX(), e.getY(), e.getModifiersEx());
1456814618     }
....@@ -14903,7 +14953,9 @@
1490314953             case 'E' : COMPACT ^= true;
1490414954                 repaint();
1490514955                 break;
14906
-            case 'W' : DEBUGHSB ^= true;
14956
+            case 'W' : // Wide Window (fullscreen)
14957
+                //DEBUGHSB ^= true;
14958
+                ObjEditor.theFrame.ToggleFullScreen();
1490714959                 repaint();
1490814960                 break;
1490914961             case 'u' : Udebug ^= true; Vdebug = false; NORMALdebug = false; programInitialized = false; repaint(); break;
....@@ -14929,13 +14981,7 @@
1492914981                 repaint();
1493014982                 break;
1493114983             case 'l':
14932
-                lightMode ^= true;
14933
-                Globals.lighttouched = true;
14934
-                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
14935
-                targetLookAt.set(manipCamera.lookAt);
14936
-                repaint();
14937
-                break;
14938
-            case 'L':
14984
+            //case 'L':
1493914985                 if (lightMode)
1494014986                 {
1494114987                     lightMode = false;
....@@ -15078,11 +15124,14 @@
1507815124             case '_':
1507915125                 kompactbit = 5;
1508015126                 break;
15081
-            case '+':
15082
-                kompactbit = 6;
15083
-                break;
15127
+//            case '+':
15128
+//                kompactbit = 6;
15129
+//                break;
1508415130             case ' ':
15085
-                ObjEditor.theFrame.ToggleFullScreen();
15131
+                lightMode ^= true;
15132
+                Globals.lighttouched = true;
15133
+                manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
15134
+                targetLookAt.set(manipCamera.lookAt);
1508615135                 repaint();
1508715136                 break;
1508815137             //case '`' :
....@@ -15129,8 +15178,9 @@
1512915178             case DELETE:
1513015179                 ClearSelection();
1513115180                 break;
15132
-                /*
1513315181             case '+':
15182
+                
15183
+                /*
1513415184                 //fontsize += 1;
1513515185                 bbzoom *= 2;
1513615186                 repaint();
....@@ -15147,17 +15197,17 @@
1514715197             case '=':
1514815198                 IncDepth();
1514915199                 //fontsize += 1;
15150
-                object.editWindow.refreshContents(true);
15200
+                object.GetWindow().refreshContents(true);
1515115201                 maskbit = 6;
1515215202                 break;
1515315203             case '-': //if (PixelThreshold>1) PixelThreshold /= 2;
1515415204                 DecDepth();
1515515205                 maskbit = 5;
1515615206                 //if(fontsize > 1) fontsize -= 1;
15157
-                if (object.editWindow == null)
15158
-                    new Exception().printStackTrace();
15159
-                else
15160
-                    object.editWindow.refreshContents(true);
15207
+//                if (object.editWindow == null)
15208
+//                    new Exception().printStackTrace();
15209
+//                else
15210
+                    object.GetWindow().refreshContents(true);
1516115211                 break;
1516215212             case '{':
1516315213                 manipCamera.shaper_fovy /= 1.1;
....@@ -15381,7 +15431,7 @@
1538115431         }
1538215432          */
1538315433 
15384
-        object.editWindow.EditSelection(false);
15434
+        object.GetWindow().EditSelection(false);
1538515435     }
1538615436 
1538715437     void SelectParent()
....@@ -15398,10 +15448,10 @@
1539815448             {
1539915449                 //selectees.remove(i);
1540015450                 System.out.println("select parent of " + elem);
15401
-                group.editWindow.Select(elem.parent.GetTreePath(), first, true);
15451
+                group.GetWindow().Select(elem.parent.GetTreePath(), first, true);
1540215452             } else
1540315453             {
15404
-                group.editWindow.Select(elem.GetTreePath(), first, true);
15454
+                group.GetWindow().Select(elem.GetTreePath(), first, true);
1540515455             }
1540615456 
1540715457             first = false;
....@@ -15443,12 +15493,12 @@
1544315493                 for (int j = 0; j < group.children.size(); j++)
1544415494                 {
1544515495                     elem = (Object3D) group.children.elementAt(j);
15446
-                    object.editWindow.Select(elem.GetTreePath(), first, true);
15496
+                    object.GetWindow().Select(elem.GetTreePath(), first, true);
1544715497                     first = false;
1544815498                 }
1544915499             } else
1545015500             {
15451
-                object.editWindow.Select(elem.GetTreePath(), first, true);
15501
+                object.GetWindow().Select(elem.GetTreePath(), first, true);
1545215502             }
1545315503 
1545415504             first = false;
....@@ -15459,21 +15509,21 @@
1545915509     {
1546015510         //Composite group = (Composite) object;
1546115511         Object3D group = object;
15462
-        group.editWindow.loadClipboard(true); // ClearSelection(false);
15512
+        group.GetWindow().loadClipboard(true); // ClearSelection(false);
1546315513     }
1546415514 
1546515515     void ResetTransform(int mask)
1546615516     {
1546715517         //Composite group = (Composite) object;
1546815518         Object3D group = object;
15469
-        group.editWindow.ResetTransform(mask);
15519
+        group.GetWindow().ResetTransform(mask);
1547015520     }
1547115521 
1547215522     void FlipTransform()
1547315523     {
1547415524         //Composite group = (Composite) object;
1547515525         Object3D group = object;
15476
-        group.editWindow.FlipTransform();
15526
+        group.GetWindow().FlipTransform();
1547715527 //        group.editWindow.ReduceMesh(true);
1547815528     }
1547915529 
....@@ -15481,7 +15531,7 @@
1548115531     {
1548215532         //Composite group = (Composite) object;
1548315533         Object3D group = object;
15484
-        group.editWindow.PrintMemory();
15534
+        group.GetWindow().PrintMemory();
1548515535 //        group.editWindow.ReduceMesh(true);
1548615536     }
1548715537     
....@@ -15489,7 +15539,7 @@
1548915539     {
1549015540         //Composite group = (Composite) object;
1549115541         Object3D group = object;
15492
-        group.editWindow.ResetCentroid();
15542
+        group.GetWindow().ResetCentroid();
1549315543     }
1549415544 
1549515545     void IncDepth()
....@@ -15665,6 +15715,7 @@
1566515715                     info.bounds.y += (height - desired) / 2;
1566615716                 }
1566715717             }
15718
+            
1566815719             info.g = gr;
1566915720             info.camera = renderCamera;
1567015721             /* 
....@@ -15674,23 +15725,44 @@
1567415725              */
1567515726             if (!isRenderer)
1567615727             {
15677
-                object.drawEditHandles(info, 0);
15678
-                
15679
-                if (drag && (X != 0 || Y != 0) && object.selection.Size() > 0)
15728
+                Grafreed.Assert(object != null);
15729
+                Grafreed.Assert(object.selection != null);
15730
+                if (object.selection.Size() > 0)
1568015731                 {
15681
-                    switch (object.selection.get(0).hitSomething)
15732
+                    int hitSomething = object.selection.get(0).hitSomething;
15733
+
15734
+                    info.DX = 0;
15735
+                    info.DY = 0;
15736
+                    info.W = 1;
15737
+                    if (hitSomething == Object3D.hitCenter)
1568215738                     {
15683
-                        case Object3D.hitCenter: gr.setColor(Color.pink);
15684
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15685
-                            break;
15686
-                        case Object3D.hitRotate: gr.setColor(Color.yellow);
15687
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15688
-                        break;
15689
-                        case Object3D.hitScale: gr.setColor(Color.cyan);
15690
-                            gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15691
-                        break;
15739
+                        info.DX = X;
15740
+                        if (X != 0)
15741
+                            info.DX -= info.bounds.width/2;
15742
+
15743
+                        info.DY = Y;
15744
+                        if (Y != 0)
15745
+                            info.DY -= info.bounds.height/2;
1569215746                     }
15693
-                    
15747
+
15748
+                    object.drawEditHandles(info, 0);
15749
+
15750
+                    if (drag && (X != 0 || Y != 0))
15751
+                    {
15752
+                        switch (hitSomething)
15753
+                        {
15754
+                            case Object3D.hitCenter: gr.setColor(Color.pink);
15755
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15756
+                                break;
15757
+                            case Object3D.hitRotate: gr.setColor(Color.yellow);
15758
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15759
+                            break;
15760
+                            case Object3D.hitScale: gr.setColor(Color.cyan);
15761
+                                gr.drawLine(X, Y, info.bounds.width/2, info.bounds.height/2);
15762
+                            break;
15763
+                        }
15764
+
15765
+                    }
1569415766                 }
1569515767             }
1569615768         }
....@@ -16488,6 +16560,14 @@
1648816560         }
1648916561     }
1649016562     
16563
+    private Object3D GetFolder()
16564
+    {
16565
+        Object3D folder = object.GetWindow().copy;
16566
+        if (object.GetWindow().copy.selection.Size() > 0)
16567
+            folder = object.GetWindow().copy.selection.elementAt(0);
16568
+        return folder;
16569
+    }
16570
+
1649116571     class SelectBuffer implements GLEventListener
1649216572     {
1649316573 
....@@ -16567,6 +16647,17 @@
1656716647 
1656816648             //gl.glDisable(GL.GL_POLYGON_OFFSET_FILL);
1656916649 
16650
+                if (PAINTMODE)
16651
+                {
16652
+                    if (object.GetWindow().copy.selection.Size() > 0)
16653
+                    {
16654
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16655
+
16656
+                        // Make what you paint not selectable.
16657
+                        paintobj.ResetSelectable();
16658
+                    }
16659
+                }
16660
+                
1657016661             //int tmp = selection_view;
1657116662             //selection_view = -1;
1657216663             int temp = DrawMode();
....@@ -16578,6 +16669,17 @@
1657816669             //    temp = DEFAULT; // patch for selection debug
1657916670             Globals.drawMode = temp; // WARNING
1658016671 
16672
+                if (PAINTMODE)
16673
+                {
16674
+                    if (object.GetWindow().copy.selection.Size() > 0)
16675
+                    {
16676
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
16677
+
16678
+                        // Revert.
16679
+                        paintobj.RestoreSelectable();
16680
+                    }
16681
+                }
16682
+                
1658116683             //gl.glBindTexture(GL.GL_TEXTURE_2D, selection_view);
1658216684 
1658316685             // trying different ways of getting the depth info over
....@@ -16681,29 +16783,31 @@
1668116783                 }
1668216784                 
1668316785                 if (!movingcamera && !PAINTMODE)
16684
-                    object.editWindow.ScreenFitPoint(); // fev 2014
16786
+                    object.GetWindow().ScreenFitPoint(); // fev 2014
1668516787                 
16686
-                if (PAINTMODE && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
16788
+                if (PAINTMODE) // && Grafreed.clipboard.size() == 1) // object.editWindow.copy.selection.Size() > 0)
1668716789                 {
16688
-                    Object3D paintobj = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
16790
+                    //Object3D paintobj; // = Grafreed.clipboard.get(0); // object.editWindow.copy.selection.elementAt(0);
1668916791                     
16690
-                    Object3D group = new Object3D("inst" + paintcount++);
16792
+                    if (object.GetWindow().copy.selection.Size() > 0)
16793
+                    {
16794
+                        Object3D paintobj = object.GetWindow().copy.selection.elementAt(0);
1669116795                     
16692
-                    group.CreateMaterial(); // use a void leaf to select instances
16693
-                    
16694
-                    group.add(paintobj); // link
16695
-                    
16696
-                    object.editWindow.SnapObject(group);
16697
-                    
16698
-                    Object3D folder = object.editWindow.copy;
16699
-                    
16700
-                    if (object.editWindow.copy.selection.Size() > 0)
16701
-                        folder = object.editWindow.copy.selection.elementAt(0);
16702
-                    
16703
-                    folder.add(group);
16704
-                    
16705
-                    object.editWindow.ResetModel();
16706
-                    object.editWindow.refreshContents();
16796
+                        Object3D inst = new Object3D("inst" + paintcount++);
16797
+
16798
+                        inst.CreateMaterial(); // use a void leaf to select instances
16799
+
16800
+                        inst.add(paintobj); // link
16801
+
16802
+                        object.GetWindow().SnapObject(inst);
16803
+
16804
+                        Object3D folder = paintFolder; // GetFolder();
16805
+
16806
+                        folder.add(inst);
16807
+
16808
+                        object.GetWindow().ResetModel();
16809
+                        object.GetWindow().refreshContents();
16810
+                    }
1670716811                 }
1670816812                 else
1670916813                     paintcount = 0;
....@@ -16742,6 +16846,11 @@
1674216846                 //System.out.println("objects[color] = " + objects[color]);
1674316847                 //objects[color].Select();
1674416848                 indexcount = 0;
16849
+                    ObjEditor window = object.GetWindow();
16850
+                    if (window != null && deselect)
16851
+                    {
16852
+                        window.Select(null, deselect, true);
16853
+                    }
1674516854                 object.Select(color, deselect);
1674616855             }
1674716856