projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
De-localize Material and FlightDataType objects when persisting in ork files. Added...
[debian/openrocket]
/
core
/
src
/
net
/
sf
/
openrocket
/
preset
/
loader
/
MaterialColumnParser.java
diff --git
a/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
b/core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
index 74a6679e1c756c4abfecb739ecf502cbf1d528e7..415c11f19139344b89ff8e78a80b1c0eb5f85202 100644
(file)
--- a/
core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
+++ b/
core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
@@
-29,7
+29,7
@@
public class MaterialColumnParser extends BaseColumnParser {
return;
}
return;
}
- Material.Bulk tmpMaterial =
new Material.Bulk(columnData, 0.0, true
);
+ Material.Bulk tmpMaterial =
(Material.Bulk) Material.newUserMaterial( Material.Type.BULK,columnData, 0.0
);
Material.Bulk m = materialMap.getBulkMaterial(tmpMaterial);
props.put(param, m!= null ? m : tmpMaterial);
Material.Bulk m = materialMap.getBulkMaterial(tmpMaterial);
props.put(param, m!= null ? m : tmpMaterial);