From 03de3b3ac69710fefc45e20961ca093e5b38c5ff Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Fri, 13 Apr 2012 01:56:06 +0000 Subject: [PATCH] When loading from preset use the direct assignment for material instead of the setter method. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@547 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../net/sf/openrocket/rocketcomponent/ExternalComponent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java index 177fddc4..4377a8c3 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java @@ -113,7 +113,6 @@ public abstract class ExternalComponent extends RocketComponent { material = mat; clearPreset(); fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); - clearPreset(); } public Finish getFinish() { @@ -137,7 +136,7 @@ public abstract class ExternalComponent extends RocketComponent { if ( preset.has(ComponentPreset.MATERIAL ) ) { Material mat = preset.get(ComponentPreset.MATERIAL); if ( mat != null ) { - setMaterial(mat); + material = mat; } /* TODO - else if (c.isMassOverridden()) { -- 2.47.2