Fix camera version + VR using spacebar.

Normand Briere

2019-08-27 dce400da7c65d659129abf9bc6e8f38b360a63d2

 ObjEditor.java
..
..
@@ -1882,7 +1882,7 @@
1882
1882
         tabbedPane.add(creditsPanel);
1883
1883
         tabbedPane.setToolTipTextAt(3, "Credits");
1884
1884
         
1885
-        if (Globals.ADVANCED)
1885
+        if (Globals.SHOWINFO)
1886
1886
         {
1887
1887
             objectPanel.add(infoPanel);
1888
1888
             objectPanel.setIconAt(5, GetIcon("icons/info.png"));
..
..
@@ -4469,6 +4469,8 @@
4469
4469
             CopyChanged(copy);
4470
4470
         
4471
4471
         SetVersionStates();
4472
+        
4473
+        SetCameras();
4472
4474
     }
4473
4475
     
4474
4476
     public boolean Save(boolean user)
..
..
@@ -4547,6 +4549,11 @@
4547
4549
     void RefreshSelection()
4548
4550
     {
4549
4551
         Object3D selection = new Object3D();
4552
+        
4553
+        if (objEditor.copy.selection == null)
4554
+        {
4555
+            objEditor.copy.selection = new Object3D();
4556
+        }
4550
4557
         
4551
4558
         for (int i = 0; i < objEditor.copy.selection.size(); i++)
4552
4559
         {
..
..
@@ -4682,7 +4689,7 @@
4682
4689
         // Option?
4683
4690
         Replace();
4684
4691
         
4685
-        System.err.println("Undo");
4692
+        //System.err.println("Previous");
4686
4693
         
4687
4694
         //cRadio tab = GetCurrentTab();
4688
4695
         
..
..
@@ -4711,6 +4718,8 @@
4711
4718
         
4712
4719
         SetVersionStates();
4713
4720
         
4721
+        SetCameras();
4722
+        
4714
4723
         return true;
4715
4724
     }
4716
4725
 
..
..
@@ -4730,6 +4739,8 @@
4730
4739
         CopyChanged(copy);
4731
4740
         
4732
4741
         SetVersionStates();
4742
+        
4743
+        SetCameras();
4733
4744
         
4734
4745
         return true;
4735
4746
     }
..
..
@@ -4771,9 +4782,20 @@
4771
4782
         //if (!tab.user[tab.versionindex])
4772
4783
         //    tab.graphs[tab.versionindex] = null;
4773
4784
         
4774
-        SetVersionStates();        
4785
+        SetVersionStates();
4786
+        
4787
+        SetCameras();
4775
4788
     }
4776
4789
 
4790
+    void SetCameras()
4791
+    {
4792
+        Camera neweye = (Camera)copy.GetObject(cameraView.cameras[0].GetUUID());
4793
+        Camera newlight = (Camera)copy.GetObject(cameraView.LightCamera().GetUUID());
4794
+        
4795
+        cameraView.SetCamera(neweye);
4796
+        cameraView.SetLight(newlight);
4797
+    }
4798
+    
4777
4799
         void ImportGFD()
4778
4800
         {
4779
4801
             FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
..
..
@@ -5119,6 +5141,7 @@
5119
5141
                 copy.versionindex = version;
5120
5142
                 CopyChanged(copy);
5121
5143
                 SetVersionStates();
5144
+                SetCameras();
5122
5145
             }
5123
5146
             
5124
5147
             return;