De-localize Material and FlightDataType objects when persisting in ork files. Added...

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / SurfaceMaterialColumnParser.java

diff --git a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
index 2dad9f0a8ac829e386b1cc63823ab98451696f52..80eaae5ffb8657842b38b951829d94cabc55e106 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
@@ -24,9 +24,9 @@ public class SurfaceMaterialColumnParser extends BaseColumnParser {
                        return;
                }
                
-               Material.Surface myMaterial = new Material.Surface(columnData, 0.0, true);
-               myMaterial = materialMap.getSurfaceMaterial(myMaterial, null);
-               props.put(param, myMaterial);
+               Material.Surface myMaterial = (Material.Surface) Material.newUserMaterial(Material.Type.SURFACE,columnData, 0.0);
+               Material.Surface m = materialMap.getSurfaceMaterial(myMaterial, null);
+               props.put(param, m!=null ? m : myMaterial);
 
        }