sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #415 from MeFisto94/master

Browse Source 
Fixes #360 : Material now serializes name
This commit is contained in:
Kirill Vainer 2016-02-17 15:17:57 -05:00
commit d1a09536e5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/material/Material.java
View File

@ -1236,12 +1236,14 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
oc.write(def.getAssetName(), "material_def", null); oc.write(def.getAssetName(), "material_def", null);
oc.write(additionalState, "render_state", null); oc.write(additionalState, "render_state", null);
oc.write(transparent, "is_transparent", false); oc.write(transparent, "is_transparent", false);
oc.write(name, "name", null);
oc.writeStringSavableMap(paramValues, "parameters", null); oc.writeStringSavableMap(paramValues, "parameters", null);
} }
public void read(JmeImporter im) throws IOException { public void read(JmeImporter im) throws IOException {
InputCapsule ic = im.getCapsule(this); InputCapsule ic = im.getCapsule(this);
name = ic.readString("name", null);
additionalState = (RenderState) ic.readSavable("render_state", null); additionalState = (RenderState) ic.readSavable("render_state", null);
transparent = ic.readBoolean("is_transparent", false); transparent = ic.readBoolean("is_transparent", false);