diff options
author | Chris Want <cwant@ualberta.ca> | 2003-12-31 07:00:26 +0300 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2003-12-31 07:00:26 +0300 |
commit | 9bc012f97cf6085735413a19d1c46ef7bccba75a (patch) | |
tree | e754428758de63caf99316eb20be7a503dbb566f | |
parent | d8b21b01c38bf2b7007458c221b2c1685d766cfd (diff) |
A fix for the missing pad1 bug: henceforth, world->pad1 shall be known as
world->gameEngine (a la tuhopuu).
-rw-r--r-- | source/blender/makesdna/DNA_world_types.h | 3 | ||||
-rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index fd367369bd5..bbe1fa6af19 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -92,6 +92,9 @@ typedef struct World { short dofsta, dofend, dofmin, dofmax; + int physicsEngine; + int pad; + struct Ipo *ipo; struct MTex *mtex[8]; diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index d3a67abecfc..15100cc3a00 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -183,7 +183,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename, if (blenderscene->world) { - switch (blenderscene->world->pad1) + switch (blenderscene->world->physicsEngine) { case 1: |