From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Fri, 4 May 2012 20:07:20 +0000 (+0000)
Subject: Don't use the default material database when loading componentpreset files.
X-Git-Tag: upstream/12.09^2~303
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3454e44e12e7a68889dedf72b7cfaef8880cce64;p=debian%2Fopenrocket

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
---

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 ) ) {