From e4c4380ab516801ea4b5ff9b0543c303cfeae137 Mon Sep 17 00:00:00 2001 From: "Kae..pl" Date: Wed, 21 Dec 2011 20:42:23 +0000 Subject: [PATCH] Fixing a bug with cloning SkeletonControl for Spatial. The anim control will always be added if the object has an armature, even if it has no animations. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8950 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../scene/plugins/blender/modifiers/ArmatureModifier.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java index 5324971e4..30944ed9c 100644 --- a/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java +++ b/engine/src/blender/com/jme3/scene/plugins/blender/modifiers/ArmatureModifier.java @@ -186,6 +186,7 @@ import com.jme3.util.BufferUtils; } // applying animations + AnimControl control = new AnimControl(animData.skeleton); ArrayList animList = animData.anims; if (animList != null && animList.size() > 0) { HashMap anims = new HashMap(animList.size()); @@ -193,11 +194,9 @@ import com.jme3.util.BufferUtils; Animation animation = animList.get(i); anims.put(animation.getName(), animation); } - - AnimControl control = new AnimControl(animData.skeleton); control.setAnimations(anims); - node.addControl(control); } + node.addControl(control); node.addControl(new SkeletonControl(animData.skeleton)); return node;