From: remy.bouquet@gmail.com <remy.bouquet@gmail.com@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Date: Wed, 15 Jun 2011 21:14:46 +0000 (+0000)
Subject: Bone, redid null check on scale in setBindTransform, ogre.xml can have null scale... 
X-Git-Tag: v0.8.0~937
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=24826880b3efef671ffeb2ea211df98d451ad92e;p=mikumikustudio%2FMikuMikuStudio.git

Bone, redid null check on scale in setBindTransform, ogre.xml can have null scale values

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7640 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---

diff --git a/engine/src/core/com/jme3/animation/Bone.java b/engine/src/core/com/jme3/animation/Bone.java
index fc8b4c536..f7a25104b 100644
--- a/engine/src/core/com/jme3/animation/Bone.java
+++ b/engine/src/core/com/jme3/animation/Bone.java
@@ -264,7 +264,7 @@ public final class Bone implements Savable {
     public Vector3f getWorldBindInverseScale() {
         return worldBindInverseScale;
     }
-    
+
     /**
      * Returns the world bind pose position.
      * <p>
@@ -288,7 +288,7 @@ public final class Bone implements Savable {
     public Quaternion getWorldBindRotation() {
         return initialRot;
     }
-    
+
     /**
      * Returns the world bind pose scale.
      * <p>
@@ -459,7 +459,7 @@ public final class Bone implements Savable {
         if (!userControl) {
             throw new IllegalStateException("User control must be on bone to allow user transforms");
         }
-        
+
         // TODO: add scale here ???
         worldPos.set(translation);
         worldRot.set(rotation);
@@ -555,11 +555,16 @@ public final class Bone implements Savable {
     public void setBindTransforms(Vector3f translation, Quaternion rotation, Vector3f scale) {
         initialPos.set(translation);
         initialRot.set(rotation);
-        initialScale.set(scale);
-        
+        //ogre.xml can have null scale values breaking this if the check is removed
+        if (scale != null) {
+            initialScale.set(scale);
+        }
+
         localPos.set(translation);
         localRot.set(rotation);
-        localScale.set(scale);
+        if (scale != null) {
+            localScale.set(scale);
+        }
     }
 
     private String toString(int depth) {