diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c21eada414cd6f3b6543783ac691b89c6bdf6e61..fcb38b704800703ef6bd2851c27addbd5b085a5b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,8 +56,8 @@ Then proceed with one of the following steps: ### Releasing a new Simox version 1. check out or update the `master' branch -2. icrease the version number X.Y.Z in the file config.cmake +2. increase the version number X.Y.Z in the file config.cmake 3. commit the changed config.cmake file 4. add a tag with 'git tag -a "vX.Y.Z" -m"vX.Y.Z"' -5. push with 'git push --tags' +5. push with 'git push && git push --tags' 6. The H2T jenkins server will automatically build a new simox package \ No newline at end of file diff --git a/SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp b/SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp index 7ca161c8e1501f3ef3290d4bfab98b878a904697..95a6633ac9bdb3b928b2a27c807f1de9f5aaaff5 100644 --- a/SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp +++ b/SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp @@ -374,6 +374,7 @@ namespace SimDynamics } btVector3 btVel = BulletEngine::getVecBullet(force, false); + rigidBody->activate(); rigidBody->applyCentralForce(btVel); } @@ -387,6 +388,7 @@ namespace SimDynamics } btVector3 btVel = BulletEngine::getVecBullet(torque, false) * BulletObject::ScaleFactor; + rigidBody->activate(); rigidBody->applyTorque(btVel); }