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/blender/editors/object | |
| 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/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/object/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index a92b25c6c85..3e7aeba63c3 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../gpu ../../ikplugin diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index a46fd04489d..db30fae1f84 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../ikplugin', diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 543b003f5a5..2008e5ad4f3 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -59,7 +59,7 @@ #include "BKE_object.h" #include "BKE_curve.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support #include "ED_object.h" #include "ED_mesh.h" |