From e1c864ff4688c3cc61d4847a456bdaff922156a8 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 24 Oct 2006 20:59:25 +0000 Subject: [PATCH] Fixed NPE in model variant handling. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@64 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/jme/model/Model.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/com/threerings/jme/model/Model.java b/src/java/com/threerings/jme/model/Model.java index dff8edec..eda95c72 100644 --- a/src/java/com/threerings/jme/model/Model.java +++ b/src/java/com/threerings/jme/model/Model.java @@ -740,9 +740,11 @@ public class Model extends ModelNode } // create an instance and rebind all animations final Model prototype = createInstance(); - for (Map.Entry entry : _anims.entrySet()) { - prototype._anims.put(entry.getKey(), - entry.getValue().rebind(prototype._pnodes)); + if (_anims != null) { + for (Map.Entry entry : _anims.entrySet()) { + prototype._anims.put(entry.getKey(), + entry.getValue().rebind(prototype._pnodes)); + } } prototype._prototype = null; prototype._pnodes = null;