Fix box and VR keys.

Normand Briere

2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5

 GroupEditor.java
..
..
@@ -570,9 +570,6 @@
570
570
 		//menu.add("-");
571
571
                 oe.jTree.popup.addSeparator();
572
572
                 
573
-		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
574
-		deleteItem.addActionListener(this);
575
-                
576
573
         if (Globals.ADVANCED)
577
574
         {
578
575
                 // Deletes the cameras...
..
..
@@ -706,15 +703,17 @@
706
703
 		setMasterItem.addActionListener(this);
707
704
         }
708
705
                 
709
-		oe.menuBar.add(menu = new Menu("Group"));
710
-//		grabItem = menu.add(new MenuItem("Grab"));
711
-//		grabItem.addActionListener(this);
706
+		oe.menuBar.add(menu = new Menu("Order"));
707
+                
712
708
 		backItem = menu.add(new MenuItem("Back"));
713
709
 		backItem.addActionListener(this);
714
710
 		frontItem = menu.add(new MenuItem("Front"));
715
711
 		frontItem.addActionListener(this);
716
712
 //		compositeItem = menu.add(new MenuItem("Composite"));
717
713
 //		compositeItem.addActionListener(this);
714
+                
715
+		grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
716
+		grabItem.addActionListener(this);
718
717
                 
719
718
         if (Globals.ADVANCED)
720
719
         {
..
..
@@ -723,6 +722,11 @@
723
722
         }
724
723
 		ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
725
724
 		ungroupItem.addActionListener(this);
725
+                
726
+                oe.jTree.popup.addSeparator();
727
+                
728
+		deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
729
+		deleteItem.addActionListener(this);
726
730
                 
727
731
 //		menu.add("-");
728
732
 //                
..
..
@@ -1065,7 +1069,7 @@
1065
1069
                 collapseButton.setToolTipText("Collapse toolbar");
1066
1070
 		collapseButton.addActionListener(this);
1067
1071
                 
1068
-		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1072
+		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
1073
                 maximize3DButton.setToolTipText("Maximize 3D view");
1070
1074
 		maximize3DButton.addActionListener(this);
1071
1075
                 
..
..
@@ -1504,6 +1508,7 @@
1504
1508
                     
1505
1509
             oe.SetupViews();
1506
1510
             
1511
+        if (Globals.DEBUG)
1507
1512
 		System.out.println("SetupViews");
1508
1513
             DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1509
1514
                   oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..
..
@@ -4114,7 +4119,10 @@
4114
4119
             copy.versionlist = new Object3D[100];
4115
4120
             copy.versionindex = -1;
4116
4121
             
4117
-            Save(true);
4122
+            // Cannot work with loops
4123
+            // To fix this issue, first mark all nodes above the root,
4124
+            // and check if any of these nodes are reachable below the root.
4125
+            //Save(true);
4118
4126
         }
4119
4127
         
4120
4128
                     SetVersionStates();
..
..
@@ -5359,7 +5367,8 @@
5359
5367
             if (group.selection != null)
5360
5368
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5361
5369
             {
5362
-                    if (!(e.nextElement() instanceof Composite))
5370
+                    Object next = e.nextElement();
5371
+                    if (!(next instanceof Composite)) // || (next instanceof GroupLeaf))
5363
5372
                     {
5364
5373
                         allComposites = false;
5365
5374
                         break;
..
..
@@ -6350,7 +6359,7 @@
6350
6359
 	private MenuItem transformGeometryItem;
6351
6360
 	private MenuItem transformChildrenItem;
6352
6361
 	private MenuItem hideItem;
6353
-	private MenuItem grabItem;
6362
+	private JMenuItem grabItem;
6354
6363
 	private MenuItem backItem;
6355
6364
 	private MenuItem frontItem;
6356
6365
 	private MenuItem cameraItem;