From 2a0c4ed10f8c902c8cb2b888d763db7ea99d9289 Mon Sep 17 00:00:00 2001
From: "rem..om" <remy.bouquet@gmail.com>
Date: Wed, 26 Oct 2011 15:10:53 +0000
Subject: [PATCH] Null checked additionalRenderState when loading a material

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8532 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 engine/src/core/com/jme3/material/Material.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/src/core/com/jme3/material/Material.java b/engine/src/core/com/jme3/material/Material.java
index 4e8bb0abf..fa488b8d9 100644
--- a/engine/src/core/com/jme3/material/Material.java
+++ b/engine/src/core/com/jme3/material/Material.java
@@ -1120,7 +1120,7 @@ public class Material implements Asset, Cloneable, Savable, Comparable<Material>
                 }
             }
         }
-        if (guessRenderStateApply){
+        if (guessRenderStateApply && additionalState != null){
             // Try to guess values of "apply" render state based on defaults
             // if value != default then set apply to true
             additionalState.applyPolyOffset = additionalState.offsetEnabled;