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

- fix possible NPE in BulletAppState

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10344 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-02-05 19:28:10 +00:00
parent cc623ef44a
commit 9f7b273517
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/bullet-common/com/jme3/bullet/BulletAppState.java
View File

@ -212,15 +212,17 @@ public class BulletAppState implements AppState, PhysicsTickListener {
} }
public void update(float tpf) { public void update(float tpf) {
if (debugEnabled && debugAppState == null) { if (debugEnabled && debugAppState == null && pSpace != null) {
debugAppState = new BulletDebugAppState(pSpace); debugAppState = new BulletDebugAppState(pSpace);
stateManager.attach(debugAppState); stateManager.attach(debugAppState);
pSpace.enableDebug(app.getAssetManager()); pSpace.enableDebug(app.getAssetManager());
} else if (!debugEnabled && debugAppState != null) { } else if (!debugEnabled && debugAppState != null) {
stateManager.detach(debugAppState); stateManager.detach(debugAppState);
debugAppState = null; debugAppState = null;
if (pSpace != null) {
pSpace.enableDebug(null); pSpace.enableDebug(null);
} }
}
//TODO: remove when deprecation of PhysicsSpace.enableDebug is through //TODO: remove when deprecation of PhysicsSpace.enableDebug is through
if (pSpace.getDebugManager() != null && !debugEnabled) { if (pSpace.getDebugManager() != null && !debugEnabled) {
debugEnabled = true; debugEnabled = true;