Merge pull request #511 from empirephoenix/master

Finally fixing this
9 years ago · e2b6c51730
parent e4840e2e9f 22db3212e1
commit e2b6c51730
1 changed files with 3 additions and 1 deletions
--- a/jme3-bullet-native/src/native/cpp/com_jme3_bullet_objects_PhysicsRigidBody.cpp
+++ b/jme3-bullet-native/src/native/cpp/com_jme3_bullet_objects_PhysicsRigidBody.cpp
@ -52,7 +52,9 @@ extern "C" {
        btMotionState* motionState = reinterpret_cast<btMotionState*>(motionstatId);
        btCollisionShape* shape = reinterpret_cast<btCollisionShape*>(shapeId);
        btVector3 localInertia = btVector3();
-        shape->calculateLocalInertia(mass, localInertia);
+	if(mass > 0){
+	        shape->calculateLocalInertia(mass, localInertia);
+	}
        btRigidBody* body = new btRigidBody(mass, motionState, shape, localInertia);
        body->setUserPointer(NULL);
        return reinterpret_cast<jlong>(body);