소스 검색

Small fix for when a MatDef file is faulty: Prevent a NPE

MeFisto94 9 년 전
부모
커밋
4582e4b0fe
1개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java

+ 6 - 5
jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java

@@ -163,12 +163,13 @@ public class MaterialPreviewRenderer implements SceneListener {
     }
     }
 
 
     public Material reloadMaterial(Material mat) {
     public Material reloadMaterial(Material mat) {
-
-        ((ProjectAssetManager) mat.getMaterialDef().getAssetManager()).clearCache();
-
-        //creating a dummy mat with the mat def of the mat to reload
-        Material dummy = new Material(mat.getMaterialDef());
+        Material dummy;
         try {
         try {
+            ((ProjectAssetManager) mat.getMaterialDef().getAssetManager()).clearCache();
+
+            //creating a dummy mat with the mat def of the mat to reload
+            dummy = new Material(mat.getMaterialDef());
+        
             for (MatParam matParam : mat.getParams()) {
             for (MatParam matParam : mat.getParams()) {
                 dummy.setParam(matParam.getName(), matParam.getVarType(), matParam.getValue());
                 dummy.setParam(matParam.getName(), matParam.getVarType(), matParam.getValue());
             }
             }