hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When loading from preset use the direct assignment for material instead of the setter method.

Browse Source
This commit is contained in:
Kevin Ruland 2012-04-13 01:56:06 +00:00
parent bd13b85927
commit 66aa9edbef
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
View File

@ -113,7 +113,6 @@ public abstract class ExternalComponent extends RocketComponent {
material = mat; material = mat;
clearPreset(); clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
clearPreset();
} }
public Finish getFinish() { public Finish getFinish() {
@ -137,7 +136,7 @@ public abstract class ExternalComponent extends RocketComponent {
if ( preset.has(ComponentPreset.MATERIAL ) ) { if ( preset.has(ComponentPreset.MATERIAL ) ) {
Material mat = preset.get(ComponentPreset.MATERIAL); Material mat = preset.get(ComponentPreset.MATERIAL);
if ( mat != null ) { if ( mat != null ) {
setMaterial(mat); material = mat;
} /* } /*
TODO - TODO -
else if (c.isMassOverridden()) { else if (c.isMassOverridden()) {