Prechádzať zdrojové kódy

* Actually fixed the setSpatial(null) bug now ..

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7289 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
sha..rd 14 rokov pred
rodič
commit
1ace200526

+ 5 - 4
engine/src/core/com/jme3/animation/AnimControl.java

@@ -270,14 +270,15 @@ public final class AnimControl extends AbstractControl implements Savable, Clone
 
 
     @Override
     @Override
     public void setSpatial(Spatial spatial) {
     public void setSpatial(Spatial spatial) {
+        if (spatial == null && skeletonControl != null){
+            this.spatial.removeControl(skeletonControl);
+        }
+
         super.setSpatial(spatial);
         super.setSpatial(spatial);
 
 
         //Backward compatibility.
         //Backward compatibility.
-        if (skeletonControl != null) {
+        if (spatial != null && skeletonControl != null) {
             spatial.addControl(skeletonControl);
             spatial.addControl(skeletonControl);
-            // once the skeleton control is added to the spatial,
-            // the AnimControl returns to "non-compatible" mode.
-            skeletonControl = null;
         }
         }
     }
     }