svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21899:21908
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 23:16:45 +0000 (23:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jul 2009 23:16:45 +0000 (23:16 +0000)
commit777a0d78e79d25c385eac4dd4835f8ca65317b26
treea3b5213e6ac6572ca966448044affec198b3e0e5
parent756488fbe2c0beaf205cb28d6f4ca1e62a64588a
parente9ca43521f99c6b9baf6d9278f85323086fcade2
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21899:21908
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h