Merge pull request #384 from Dokthar/fix_physicsRigidBody_read

fix #383 : in PhysicsRigidBody the old statement in read() (l.741) was always false
cleanup_build_scripts
Kirill Vainer 9 years ago
commit d5ba6b92bd
  1. 4
      jme3-bullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java

@ -737,8 +737,8 @@ public class PhysicsRigidBody extends PhysicsCollisionObject {
setKinematic(capsule.readBoolean("kinematic", false)); setKinematic(capsule.readBoolean("kinematic", false));
setRestitution(capsule.readFloat("restitution", 0)); setRestitution(capsule.readFloat("restitution", 0));
Vector3f angularFactor = (Vector3f) capsule.readSavable("angularFactor", Vector3f.NAN.clone()); Vector3f angularFactor = (Vector3f) capsule.readSavable("angularFactor", null);
if(angularFactor == Vector3f.NAN) { if(angularFactor == null) {
setAngularFactor(capsule.readFloat("angularFactor", 1)); setAngularFactor(capsule.readFloat("angularFactor", 1));
} else { } else {
setAngularFactor(angularFactor); setAngularFactor(angularFactor);

Loading…
Cancel
Save