diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
commit | 225c5fee6b046b9829643f82cf6cbce159e4e007 (patch) | |
tree | 4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/gameengine/Ketsji | |
parent | 60befcdc6297281ce226273123d3ccfc0a681aff (diff) |
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/gameengine/Ketsji')
-rw-r--r-- | source/gameengine/Ketsji/KX_MaterialIpoController.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp index 9a19cb08fad..a11392e9464 100644 --- a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp +++ b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp @@ -6,7 +6,7 @@ #include "KX_ScalarInterpolator.h" #include "KX_GameObject.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support bool KX_MaterialIpoController::Update(double currentTime) { diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 0690bdd6538..1a479298d1a 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -45,7 +45,7 @@ incs += ' #source/blender/makesdna #source/blender/makesrna #source/blender/pyth incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions #source/gameengine/Network' incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common' incs += ' #source/gameengine/Physics/Dummy' -incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu' +incs += ' #source/blender/misc #extern/glew/include #source/blender/gpu' incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detour/Include' incs += ' ' + env['BF_BULLET_INC'] |