Normand Briere
2019-06-03 e24558ddeacfc945b9e9ba0a32b552d04e2ed4dd
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);
....@@ -2281,7 +2281,7 @@
22812281 {
22822282 RevertMeshes();
22832283 } else
2284
- if (source == resetMeshItem)
2284
+ if (source == resetAllItem)
22852285 {
22862286 ResetAll();
22872287 } else
....@@ -3652,7 +3652,16 @@
36523652 String pigment = Object3D.GetPigment(tex);
36533653 //String bump = Object3D.GetBump(tex);
36543654
3655
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3655
+ com.sun.opengl.util.texture.TextureData texturedata = null;
3656
+
3657
+ try
3658
+ {
3659
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3660
+ }
3661
+ catch (Exception e)
3662
+ {
3663
+ System.err.println("FAIL: " + node);
3664
+ }
36563665
36573666 double s = v.s;
36583667
....@@ -5131,7 +5140,7 @@
51315140 private MenuItem linkverticesItem;
51325141 private MenuItem relinkverticesItem;
51335142 private MenuItem setMasterItem;
5134
- private MenuItem resetMeshItem;
5143
+ private MenuItem resetAllItem;
51355144 private MenuItem stepAllItem;
51365145 private MenuItem revertMeshItem;
51375146 private MenuItem poseMeshItem;