From 3454e44e12e7a68889dedf72b7cfaef8880cce64 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Fri, 4 May 2012 20:07:20 +0000 Subject: [PATCH] Don't use the default material database when loading componentpreset files. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@643 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java index a67b9ca8..c9278ecf 100644 --- a/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java +++ b/core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java @@ -183,11 +183,7 @@ public abstract class BaseComponentDTO { return materialDTO.asMaterial(); } } - // Check for the material in the default database. - Material defaultMaterial = Databases.findMaterial(Material.Type.valueOf(material.type), material.material); - if ( defaultMaterial != null ) { - return defaultMaterial; - } + // Don't have one, build one. if ( "BULK".equals( dto.type ) ) { -- 2.47.2