]> git.gag.com Git - debian/openrocket/commitdiff
Don't use the default material database when loading componentpreset files.
authorkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 4 May 2012 20:07:20 +0000 (20:07 +0000)
committerkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 4 May 2012 20:07:20 +0000 (20:07 +0000)
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

index a67b9ca8c8ff9572361ca1dfd7853cf3cd1fb0e2..c9278ecff6d8fa32b867d66f43bb3679feb4290e 100644 (file)
@@ -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 ) ) {