Merge pull request #143 from davidB/fix_npe

SDK: fix NPE in JmeGeometry.propertyChange
This commit is contained in:
normen 2014-06-03 22:52:21 +02:00
commit 202267e398

View File

@ -155,7 +155,9 @@ public class JmeGeometry extends JmeSpatial implements MaterialChangeListener {
public void run() { public void run() {
try { try {
SceneExplorerTopComponent.findInstance().swapMaterialChangeListener(JmeGeometry.this, ((Material) before).getAssetName(), ((Material) after).getAssetName()); String beforeName = (before == null)? null : ((Material) before).getAssetName();
String afterName = (after == null)? null : ((Material) after).getAssetName();
SceneExplorerTopComponent.findInstance().swapMaterialChangeListener(JmeGeometry.this, beforeName, afterName);
} catch (Exception e) { } catch (Exception e) {
Exceptions.printStackTrace(e); Exceptions.printStackTrace(e);
} }