blame | history | patch | commit | commitdiff
Normand Briere
2019-06-09 3ae9b1de47e51e7c150412f2bb14383cb6a5f8f8 
 GroupEditor.java
....@@ -210,10 +210,6 @@
210210 		oe.menuBar.add(menu = new Menu("Setting"));
211211         if (Globals.ADVANCED)
212212         {
213
-                resetMeshItem = menu.add(new MenuItem("Reset All"));
214
-		resetMeshItem.addActionListener(this);
215
-		stepAllItem = menu.add(new MenuItem("Step All"));
216
-		stepAllItem.addActionListener(this);
217213 		revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218214 		revertMeshItem.addActionListener(this);
219215 		resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
....@@ -372,6 +368,10 @@
372368                 oe.menuBar.add(menu = new Menu("Attributes"));
373369 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374370 		clearMaterialsItem.addActionListener(this);
371
+                resetAllItem = menu.add(new MenuItem("Reset All"));
372
+		resetAllItem.addActionListener(this);
373
+		stepAllItem = menu.add(new MenuItem("Step All"));
374
+		stepAllItem.addActionListener(this);
375375 		menu.add("-");
376376 		liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377377 		liveleavesItem.addActionListener(this);
....@@ -493,7 +493,7 @@
493493                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494494                 
495495                 oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496
-                liveCB.setToolTipText("Enabled animation");
496
+                liveCB.setToolTipText("Enable animation");
497497                                 liveCB.addItemListener(this);
498498 
499499 		oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -729,6 +729,7 @@
729729             buttonGroup.add(radioButton);
730730             radioButton.doClick();
731731         }
732
+        
732733         void SetupViews(ObjEditor oe)
733734         {
734735             oe.SetupViews();
....@@ -2281,7 +2282,7 @@
22812282 		{
22822283 			RevertMeshes();
22832284 		} else
2284
-		if (source == resetMeshItem)
2285
+		if (source == resetAllItem)
22852286 		{
22862287 			ResetAll();
22872288 		} else
....@@ -3079,7 +3080,9 @@
30793080                         frontView.object = group;
30803081                         sideView.object = group;
30813082                     }
3082
-                    group.editWindow = this;
3083
+                    
3084
+// fix "+" issue                    group.editWindow = this;
3085
+                    
30833086                     /*
30843087                     currentLayout = radio.layout;
30853088                     if (currentLayout == null)
....@@ -3652,7 +3655,16 @@
36523655                             String pigment = Object3D.GetPigment(tex);
36533656                             //String bump = Object3D.GetBump(tex);
36543657                             
3655
-                            com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3658
+                            com.sun.opengl.util.texture.TextureData texturedata = null;
3659
+                            
3660
+                            try
3661
+                            {
3662
+                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3663
+                            }
3664
+                            catch (Exception e)
3665
+                            {
3666
+                                System.err.println("FAIL: " + node);
3667
+                            }
36563668                             
36573669                             double s = v.s;
36583670                             
....@@ -4124,7 +4136,7 @@
41244136                     objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
41254137                     
41264138 			Object3D elem = (Object3D)group.selection.elementAt(i);
4127
-                        if(elem != group)
4139
+                        if(elem != group || !newWindow)
41284140                         {
41294141                         //    if (!(elem instanceof Composite))
41304142                         //        newWindow = false;
....@@ -5131,7 +5143,7 @@
51315143 	private MenuItem linkverticesItem;
51325144 	private MenuItem relinkverticesItem;
51335145 	private MenuItem setMasterItem;
5134
-	private MenuItem resetMeshItem;
5146
+	private MenuItem resetAllItem;
51355147 	private MenuItem stepAllItem;
51365148 	private MenuItem revertMeshItem;
51375149 	private MenuItem poseMeshItem;