~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -210,10 +210,6 @@
210	210	oe.menuBar.add(menu = new Menu("Setting"));
211	211	if (Globals.ADVANCED)
212	212	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	214	revertMeshItem.addActionListener(this);
219	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -372,6 +368,10 @@
372	368	oe.menuBar.add(menu = new Menu("Attributes"));
373	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	370	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);
375	375	menu.add("-");
376	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	377	liveleavesItem.addActionListener(this);
..	..	@@ -493,7 +493,7 @@
493	493	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	494
495	495	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	496	+ liveCB.setToolTipText("Enable animation");
497	497	liveCB.addItemListener(this);
498	498
499	499	oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -729,6 +729,7 @@
729	729	buttonGroup.add(radioButton);
730	730	radioButton.doClick();
731	731	}
	732	+
732	733	void SetupViews(ObjEditor oe)
733	734	{
734	735	oe.SetupViews();
..	..	@@ -2281,7 +2282,7 @@
2281	2282	{
2282	2283	RevertMeshes();
2283	2284	} else
2284		- if (source == resetMeshItem)
	2285	+ if (source == resetAllItem)
2285	2286	{
2286	2287	ResetAll();
2287	2288	} else
..	..	@@ -3079,7 +3080,9 @@
3079	3080	frontView.object = group;
3080	3081	sideView.object = group;
3081	3082	}
3082		- group.editWindow = this;
	3083	+
	3084	+// fix "+" issue group.editWindow = this;
	3085	+
3083	3086	/*
3084	3087	currentLayout = radio.layout;
3085	3088	if (currentLayout == null)
..	..	@@ -3652,7 +3655,16 @@
3652	3655	String pigment = Object3D.GetPigment(tex);
3653	3656	//String bump = Object3D.GetBump(tex);
3654	3657
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	+ }
3656	3668
3657	3669	double s = v.s;
3658	3670
..	..	@@ -4124,7 +4136,7 @@
4124	4136	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4137
4126	4138	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4139	+ if(elem != group \|\| !newWindow)
4128	4140	{
4129	4141	// if (!(elem instanceof Composite))
4130	4142	// newWindow = false;
..	..	@@ -5131,7 +5143,7 @@
5131	5143	private MenuItem linkverticesItem;
5132	5144	private MenuItem relinkverticesItem;
5133	5145	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5146	+ private MenuItem resetAllItem;
5135	5147	private MenuItem stepAllItem;
5136	5148	private MenuItem revertMeshItem;
5137	5149	private MenuItem poseMeshItem;