2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).

1 files changed, 18 insertions, 2 deletions

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index 46e46b014b5..602486e0017 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -1101,8 +1101,24 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	{
 		btRigidBody* rbody = physicscontroller->GetRigidBody();
 
-		if (rbody && objprop->m_disableSleeping)
-			rbody->setActivationState(DISABLE_DEACTIVATION);
+		if (rbody)
+		{
+			btVector3 linearFactor(
+				objprop->m_lockXaxis? 0 : 1,
+				objprop->m_lockYaxis? 0 : 1,
+				objprop->m_lockZaxis? 0 : 1);
+			btVector3 angularFactor(
+				objprop->m_lockXRotaxis? 0 : 1,
+				objprop->m_lockYRotaxis? 0 : 1,
+				objprop->m_lockZRotaxis? 0 : 1);
+			rbody->setLinearFactor(linearFactor);
+			rbody->setAngularFactor(angularFactor);
+
+			if (rbody && objprop->m_disableSleeping)
+			{
+				rbody->setActivationState(DISABLE_DEACTIVATION);
+			}
+		}
 	}
 
 	CcdPhysicsController* parentCtrl = objprop->m_dynamic_parent ? (KX_BulletPhysicsController*)objprop->m_dynamic_parent->GetPhysicsController() : 0;