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/makesrna/intern | |
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/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh_api.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_meta_api.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose_api.c | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 2e0eacf90e5..11a4dcfab8a 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -257,7 +257,6 @@ blender_include_dirs( . .. ../../blenkernel - ../../blenloader ../../blenlib ../../bmesh ../../blenfont diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 316c3fde5d5..49528db0022 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -66,7 +66,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../editors/include', '../../ikplugin', diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index 3b0936a3830..696ee8cbfa0 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -34,7 +34,7 @@ #include "RNA_define.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_meta_api.c b/source/blender/makesrna/intern/rna_meta_api.c index 500e202b16f..abf3de02aa0 100644 --- a/source/blender/makesrna/intern/rna_meta_api.c +++ b/source/blender/makesrna/intern/rna_meta_api.c @@ -34,7 +34,7 @@ #include "RNA_define.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index c6ce185d9f3..eab13ae4165 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -51,7 +51,7 @@ #include "rna_internal.h" -#include "BLO_sys_types.h" /* needed for intptr_t used in ED_mesh.h */ +#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */ #include "ED_mesh.h" #include "WM_api.h" diff --git a/source/blender/makesrna/intern/rna_pose_api.c b/source/blender/makesrna/intern/rna_pose_api.c index 29d7c616d25..465a86adc31 100644 --- a/source/blender/makesrna/intern/rna_pose_api.c +++ b/source/blender/makesrna/intern/rna_pose_api.c @@ -40,7 +40,7 @@ #include "DNA_object_types.h" -/* #include "BLO_sys_types.h" */ +/* #include "BLI_sys_types.h" */ #include "rna_internal.h" /* own include */ |