diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 3ff980110e7..612c095aac7 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -101,7 +101,7 @@ World *add_world(char *name) wrld->aoenergy= 1.0; wrld->aobias= 0.05; - wrld->physicsEngine= WOPHY_SUMO; + wrld->physicsEngine= WOPHY_BULLET;//WOPHY_SUMO; Bullet by default return wrld; } diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index ee47f86157e..293845c51b3 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -58,6 +58,8 @@ BL_ActionActuator::~BL_ActionActuator() { + //todo Charlie, can you look into this? + /* if (m_pose) { free_pose_channels(m_pose); MEM_freeN(m_pose); @@ -74,6 +76,8 @@ BL_ActionActuator::~BL_ActionActuator() MEM_freeN(m_blendpose); m_blendpose = NULL; }; + */ + } diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 28af414de83..e06733ae919 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -254,7 +254,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename, //find out which physics engine Scene *blenderscene = GetSceneForName2(m_maggie, scenename); - e_PhysicsEngine physics_engine = UseSumo; + e_PhysicsEngine physics_engine = UseBullet; if (blenderscene) {