From 82de99ca94c8f1aef520b6ff801340201ec373f5 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Mon, 10 Oct 2011 23:03:04 +0000 Subject: [PATCH] - make "Add Asset" action of AssetPack browser more robust git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8383 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/gde/assetpack/actions/AddAssetAction.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java index b23aa17cc..7499b55c1 100644 --- a/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java +++ b/sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java @@ -8,6 +8,7 @@ import com.jme3.gde.assetpack.AssetConfiguration; import com.jme3.gde.assetpack.AssetPackLoader; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.scene.SceneApplication; +import com.jme3.gde.core.scene.SceneRequest; import com.jme3.scene.Spatial; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; @@ -30,7 +31,11 @@ public final class AddAssetAction implements Action { public void actionPerformed(ActionEvent ev) { ProjectAssetManager pm = context.getLookup().lookup(ProjectAssetManager.class); - ProjectAssetManager scenePm = SceneApplication.getApplication().getCurrentSceneRequest().getManager(); + SceneRequest req = SceneApplication.getApplication().getCurrentSceneRequest(); + ProjectAssetManager scenePm = null; + if (req != null) { + scenePm = req.getManager(); + } if (pm == null) { Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "AssetManager not found!"); return; @@ -46,7 +51,7 @@ public final class AddAssetAction implements Action { Spatial model = AssetPackLoader.loadAssetPackModel(pm, conf); if (model != null) { SceneComposerTopComponent.findInstance().addModel(model); - AssetPackLoader.addModelFiles(pm, scenePm,conf); + AssetPackLoader.addModelFiles(pm, scenePm, conf); } else { Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Error loading model"); }