diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-04-27 08:37:20 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-04-27 08:37:20 +0400 |
| commit | b18763a265a83eb4fcc2571040dd1e91b45d7f3d (patch) | |
| tree | 469c8e5b5bd6b37d8d8e64ed794dbf26bbf23269 /source/gameengine | |
| parent | 444f4e894f0b70be2eba90dfc4d0a6fdee96c3f9 (diff) | |
make Bullet default physics engine. However, it still loads some default .blend that set's sumo default. todo: find out about this.
commented out some code that makes Blender crashing, after leaving the game engine (armature deletes some pose, which deletes constraints, which are still in the dependency graph. Ask Charlie)
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
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) { |