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 | |
| 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.
161 files changed, 83 insertions, 307 deletions
diff --git a/extern/carve/include/carve/win32.h b/extern/carve/include/carve/win32.h index 5f8ce3b3bf6..8b5021cf2fb 100755 --- a/extern/carve/include/carve/win32.h +++ b/extern/carve/include/carve/win32.h @@ -37,7 +37,7 @@ typedef unsigned long uintptr_t; #if defined(_WIN32) && !defined(__MINGW32__) /* The __intXX are built-in types of the visual complier! So we don't need to include anything else here. - This typedefs should be in sync with types from MEM_sys_types.h */ + This typedefs should be in sync with types from BLI_sys_types.h */ typedef signed __int8 int8_t; typedef signed __int16 int16_t; diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 0eb4e02e84f..e03bfdea819 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -43,7 +43,7 @@ #include <functional> -#include "MEM_sys_types.h" +#include "../../source/blender/blenlib/BLI_sys_types.h" enum { empty_tag = 0x0, diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 710e8ba6a90..29295d664ad 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../../mikktspace ../../../source/blender/makesdna ../../../source/blender/makesrna - ../../../source/blender/blenloader ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern ) diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index 75f082fe834..98d0f290350 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -87,7 +87,6 @@ add_library(blenfont_lib ${SRC_NEW}) # grr, blenfont needs BLI include_directories( "../../../source/blender/blenlib" - "../../../source/blender/blenloader" ) add_library(bli_lib "../../../source/blender/blenlib/intern/fileops.c" diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 243dc462e65..4f6c177ef7d 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -35,7 +35,6 @@ set(SRC ./intern/mallocn.c MEM_guardedalloc.h - MEM_sys_types.h ) if(WIN32 AND NOT UNIX) diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index beffaece865..d49dc4b4dd9 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -61,7 +61,9 @@ #define __MEM_GUARDEDALLOC_H__ #include <stdio.h> /* needed for FILE* */ -#include "MEM_sys_types.h" /* needed for uintptr_t */ + +/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */ +#include "../../source/blender/blenlib/BLI_sys_types.h" /* some GNU attributes are only available from GCC 4.3 */ #define MEM_GNU_ATTRIBUTES (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h deleted file mode 100644 index 72563fc988d..00000000000 --- a/intern/guardedalloc/MEM_sys_types.h +++ /dev/null @@ -1,142 +0,0 @@ -/* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file MEM_sys_types.h - * \ingroup MEM - * - * A platform-independent definition of [u]intXX_t - * Plus the accompanying header include for htonl/ntohl - * - * This file includes <sys/types.h> to define [u]intXX_t types, where - * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this - * file. - * - Windows uses __intXX compiler-builtin types. These are signed, - * so we have to flip the signs. - * For these rogue platforms, we make the typedefs ourselves. - * - */ - -/* -// DG: original BLO_sys_types.h is in source/blender/blenkernel -// but is not allowed be accessed here because of bad-level-call -// jesterKing: I've renamed this to MEM_sys_types.h, because otherwise -// doxygen would get a conflict -*/ - -#ifndef __MEM_SYS_TYPES_H__ -#define __MEM_SYS_TYPES_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) && !defined(FREE_WINDOWS) - -/* The __intXX are built-in types of the visual complier! So we don't - * need to include anything else here. */ - - -typedef signed __int8 int8_t; -typedef signed __int16 int16_t; -typedef signed __int32 int32_t; -typedef signed __int64 int64_t; - -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; - -#ifndef _INTPTR_T_DEFINED -#ifdef _WIN64 -typedef __int64 intptr_t; -#else -typedef long intptr_t; -#endif -#define _INTPTR_T_DEFINED -#endif - -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; -#else -typedef unsigned long uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif - -#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__) - - /* Linux-i386, Linux-Alpha, Linux-ppc */ -#include <stdint.h> - -/* XXX */ - -#ifndef UINT64_MAX -# define UINT64_MAX 18446744073709551615 -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -typedef uint64_t u_int64_t; -#endif - -#elif defined (__APPLE__) - -#include <inttypes.h> - -#elif defined(FREE_WINDOWS) -#include <stdint.h> - -#else - - /* FreeBSD, Solaris */ -#include <sys/types.h> - -#endif /* ifdef platform for types */ - - -#ifdef _WIN32 -#ifndef FREE_WINDOWS -#ifndef htonl -#define htonl(x) correctByteOrder(x) -#endif -#ifndef ntohl -#define ntohl(x) correctByteOrder(x) -#endif -#endif -#elif defined (__FreeBSD__) || defined (__OpenBSD__) -#include <sys/param.h> -#elif defined (__APPLE__) -#include <sys/types.h> -#else /* sun linux */ -#include <netinet/in.h> -#endif /* ifdef platform for htonl/ntohl */ - -#ifdef __cplusplus -} -#endif - -#endif /* __MEM_SYS_TYPES_H__ */ diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h index fdbb249a932..c84882b1052 100644 --- a/intern/guardedalloc/mmap_win.h +++ b/intern/guardedalloc/mmap_win.h @@ -48,7 +48,8 @@ #define MAP_FAILED ((void *)-1) -#include "MEM_sys_types.h" // needed for intptr_t +/* needed for uintptr_t, exception, dont use BLI anywhere else in MEM_* */ +#include "../../source/blender/blenlib/BLI_sys_types.h" void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset); intptr_t munmap(void *ptr, intptr_t size); diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h index b4c0559b511..2bcdf3a6fa5 100644 --- a/intern/memutil/MEM_Allocator.h +++ b/intern/memutil/MEM_Allocator.h @@ -30,7 +30,6 @@ #include <stddef.h> #include "guardedalloc/MEM_guardedalloc.h" -#include "guardedalloc/MEM_sys_types.h" template<typename _Tp> struct MEM_Allocator diff --git a/intern/opennl/superlu/superlu_sys_types.h b/intern/opennl/superlu/superlu_sys_types.h index 5685b34f1f4..0e32be13323 100644 --- a/intern/opennl/superlu/superlu_sys_types.h +++ b/intern/opennl/superlu/superlu_sys_types.h @@ -42,7 +42,7 @@ /* -// DG: original BLO_sys_types.h is in source/blender/blenkernel +// DG: original BLI_sys_types.h is in source/blender/blenkernel // but is not allowed be accessed here because of bad-level-call // jesterKing: renamed to superlu_sys_types.h */ diff --git a/source/blender/SConscript b/source/blender/SConscript index 66d54961131..3064d7d9ed6 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -32,7 +32,6 @@ SConscript(['avi/SConscript', 'bmesh/SConscript', 'blenkernel/SConscript', 'blenlib/SConscript', - 'blenloader/SConscript', 'gpu/SConscript', 'editors/SConscript', 'imbuf/SConscript', diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h index 7c217c9223d..cfa314bba04 100644 --- a/source/blender/avi/AVI_avi.h +++ b/source/blender/avi/AVI_avi.h @@ -53,7 +53,7 @@ #ifndef __AVI_AVI_H__ #define __AVI_AVI_H__ -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" #include <stdio.h> /* for FILE */ typedef struct _AviChunk { diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 1b1ec1c08af..48e64695822 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -43,8 +43,8 @@ #endif #include "MEM_guardedalloc.h" -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_fileops.h" diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 7bb80c34323..2debe516dd7 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -25,7 +25,6 @@ set(INC . ../blenkernel ../blenlib - ../blenloader ../editors/include ../makesdna ../makesrna diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index e2ff41e9b9c..3973fed677f 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -38,7 +38,6 @@ incs = [ '#/extern/glew/include', '../blenkernel', '../blenlib', - '../blenloader', '../editors/include', '../imbuf', '../makesdna', diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index b72667b5935..0b6a3be7c84 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -38,7 +38,7 @@ extern "C" { #endif -#include "../blenloader/BLO_sys_types.h" /* XXX, should have a more generic include for this */ +#include "BLI_sys_types.h" /* XXX, should have a more generic include for this */ #include "BLI_utildefines.h" struct BMesh; diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index a3fadcb5bbe..a0e7b4d96aa 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -8,7 +8,7 @@ #include <math.h> #include "MEM_guardedalloc.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support #include "BLI_utildefines.h" /* for BLI_assert */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 02de0ce1d40..ca8a5bc9fda 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -74,7 +74,7 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm); #endif -#include "BLO_sys_types.h" /* for intptr_t support */ +#include "BLI_sys_types.h" /* for intptr_t support */ #include "GL/glew.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 6486c4c150b..f3de4001dea 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -60,7 +60,7 @@ #include "BKE_lattice.h" #include "BKE_modifier.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support static void boundbox_displist(Object *ob); static void boundbox_dispbase(BoundBox *bb, ListBase *dispbase); diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 9c265814b8f..8bda957f187 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -49,7 +49,7 @@ #include "BKE_icons.h" #include "BKE_global.h" /* only for G.background test */ -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support #include "GPU_extensions.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 919738afe7a..e28b1bf3f69 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -89,7 +89,7 @@ #include "GPU_draw.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /* for image user iteration */ #include "DNA_node_types.h" diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 7a5bc33d323..878651cdb39 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -35,7 +35,7 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_edgehash.h" diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index 978c1a7c9b0..33a76d0c03d 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -28,7 +28,7 @@ #include <stddef.h> -#include "BLO_sys_types.h" /* for intptr_t */ +#include "BLI_sys_types.h" /* for intptr_t */ #include "MEM_guardedalloc.h" diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 0708b2fed4d..7bf21b79899 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -150,6 +150,7 @@ set(SRC BLI_string.h BLI_string_cursor_utf8.h BLI_string_utf8.h + BLI_sys_types.h BLI_threads.h BLI_utildefines.h BLI_uvproject.h diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index b8e3d70ce99..749c008d8c3 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -35,11 +35,11 @@ #include "MEM_guardedalloc.h" +#include "BLI_sys_types.h" /* for intptr_t support */ #include "BLI_utildefines.h" #include "BLI_mempool.h" #include "BLI_ghash.h" -#include "MEM_sys_types.h" /* for intptr_t support */ /***/ #ifdef __GNUC__ diff --git a/source/blender/blenlib/intern/endian_switch.c b/source/blender/blenlib/intern/endian_switch.c index e3ed88b6f8d..892d7396011 100644 --- a/source/blender/blenlib/intern/endian_switch.c +++ b/source/blender/blenlib/intern/endian_switch.c @@ -24,7 +24,7 @@ * \ingroup bli */ -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_endian_switch.h" diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 26e1ea13076..d4a8b800f17 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -65,8 +65,7 @@ #include "BLI_string.h" #include "BLI_path_util.h" #include "BLI_fileops.h" - -#include "MEM_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /* gzip the file in from and write it to "to". diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 5b929195aea..7d5c8c339f4 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -52,7 +52,6 @@ set(SRC BLO_blend_defs.h BLO_readfile.h BLO_runtime.h - BLO_sys_types.h BLO_undofile.h BLO_writefile.h intern/readfile.h diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 9678dffe5af..aec91dedf8f 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -63,7 +63,7 @@ #include "readfile.h" -#include "BLO_sys_types.h" // needed for intptr_t +#include "BLI_sys_types.h" // needed for intptr_t #ifdef WIN32 # include "BLI_winstuff.h" diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 8b021f75f28..24daa41201d 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../blenkernel ../blenlib ../blenfont - ../blenloader ../editors/include ../makesdna ../makesrna diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 38ffa471070..1bd3947ff49 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -39,7 +39,6 @@ incs = [ '../blenfont', '../blenkernel', '../windowmanager', - '../blenloader', '../makesdna', '../makesrna', '../editors/include', diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 4b058a41f71..b3ec7c78808 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -31,7 +31,6 @@ set(INC ../blenkernel ../blenlib ../blenlib - ../blenloader ../imbuf ../makesdna ../makesrna diff --git a/source/blender/compositor/SConscript b/source/blender/compositor/SConscript index df22d99f76d..c0388438a98 100644 --- a/source/blender/compositor/SConscript +++ b/source/blender/compositor/SConscript @@ -38,7 +38,6 @@ incs = [ '#/intern/opencl', '../blenkernel', '../blenlib', - '../blenloader', '../imbuf', '../makesdna', '../makesrna', diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 9e1e44e411d..d6030a967d5 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index e48e35e9e69..0f4fb71242b 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 8299446bfda..12acc85e443 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -28,7 +28,7 @@ * \ingroup edanimation */ -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index b9a3daa4e51..15a75c57758 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -32,7 +32,7 @@ #include <stdlib.h> #include <math.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index d9555108733..1a0841f5342 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index 768f0834ae1..51345d94e60 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index c38ded49830..4f34bd19b5b 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript index a7d8b15da32..de395a6cd46 100644 --- a/source/blender/editors/curve/SConscript +++ b/source/blender/editors/curve/SConscript @@ -39,7 +39,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 762db26bc4f..904ad4892ed 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../imbuf ../../makesdna ../../makesrna diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index 4ce9921bb09..8b891fcb8cf 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index fae3416e00a..50c348a015f 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -34,7 +34,7 @@ #include <math.h> #include <float.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c index 7055eb3ee1b..75ff0895931 100644 --- a/source/blender/editors/gpencil/gpencil_ops.c +++ b/source/blender/editors/gpencil/gpencil_ops.c @@ -32,7 +32,7 @@ #include <stddef.h> #include <stdio.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index ea05fc6166a..9da24f1980c 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -32,7 +32,7 @@ #ifndef __UI_INTERFACE_H__ #define __UI_INTERFACE_H__ -#include "BLO_sys_types.h" /* size_t */ +#include "BLI_sys_types.h" /* size_t */ #include "RNA_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 8ba86673f87..a8b8765a5c6 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../gpu ../../imbuf ../../makesdna diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 734b9565884..0dc77ec5a3e 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index d4ae5b8b29b..f331dea5c5c 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../makesdna ../../makesrna diff --git a/source/blender/editors/io/SConscript b/source/blender/editors/io/SConscript index 0a4b6f19a3e..0facb24e2c3 100644 --- a/source/blender/editors/io/SConscript +++ b/source/blender/editors/io/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../collada', '../../makesrna', '../../windowmanager', diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt index 25fb9cb6430..b1cf6db3144 100644 --- a/source/blender/editors/mask/CMakeLists.txt +++ b/source/blender/editors/mask/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../include ../../blenkernel - ../../blenloader ../../blenlib ../../makesdna ../../makesrna diff --git a/source/blender/editors/mask/SConscript b/source/blender/editors/mask/SConscript index 0db3208bbba..a80d3317c89 100644 --- a/source/blender/editors/mask/SConscript +++ b/source/blender/editors/mask/SConscript @@ -37,7 +37,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../makesdna', '../../makesrna', '../../windowmanager', diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 4a4507acc30..1fdf97bbbd3 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../gpu ../../imbuf diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index fef3f00546f..e7ed3aae7d1 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -40,7 +40,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 4ea596cefbf..0f9de8dbf87 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../render/extern/include diff --git a/source/blender/editors/metaball/SConscript b/source/blender/editors/metaball/SConscript index 2ee2f1d1bd8..fb82cb032c8 100644 --- a/source/blender/editors/metaball/SConscript +++ b/source/blender/editors/metaball/SConscript @@ -36,7 +36,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../gpu', '../../imbuf', '../../makesdna', 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" diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 3701598f87f..892d71befb4 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index 59a54f4ab05..0fda34a86b1 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -38,7 +38,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index c9c4c253e28..4ff1767f582 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../gpu ../../imbuf diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 506933042c6..affa28863c9 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 0899fb97a2a..9b46a07b60e 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../../blenkernel ../../blenlib ../../blenfont - ../../blenloader ../../bmesh ../../gpu ../../imbuf diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index b2e936058a0..b0118fbbf53 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -39,7 +39,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 29acc28df47..4670a8294f6 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -63,7 +63,7 @@ #include "ED_view3d.h" #include "ED_screen.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "ED_mesh.h" /* for face mask functions */ #include "WM_api.h" diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 6bbb3483d11..245ee657bc3 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 67bc799dd6f..016f8055da0 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -35,7 +35,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index f53d26d323f..e0dc2709cf3 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript index 579d3604382..0421c4cc3ee 100644 --- a/source/blender/editors/space_action/SConscript +++ b/source/blender/editors/space_action/SConscript @@ -35,7 +35,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 0abdd134046..3932924a521 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../io ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../makesdna ../../makesrna diff --git a/source/blender/editors/space_api/SConscript b/source/blender/editors/space_api/SConscript index b7d8342f6fa..bd0f490a56d 100644 --- a/source/blender/editors/space_api/SConscript +++ b/source/blender/editors/space_api/SConscript @@ -36,7 +36,6 @@ incs = [ '../io', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index 10080c62594..b20301cfc3b 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript index 764ed4b1388..61f9b6f496e 100644 --- a/source/blender/editors/space_buttons/SConscript +++ b/source/blender/editors/space_buttons/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index e09a8b41262..7689aa28169 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../include ../../blenkernel - ../../blenloader ../../blenfont ../../blenlib ../../imbuf diff --git a/source/blender/editors/space_clip/SConscript b/source/blender/editors/space_clip/SConscript index b200be0fd91..d4483eda6e3 100644 --- a/source/blender/editors/space_clip/SConscript +++ b/source/blender/editors/space_clip/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../gpu', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 2f1c3f4a244..241a48c1e2d 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript index 5af5818b220..0395a33cd97 100644 --- a/source/blender/editors/space_console/SConscript +++ b/source/blender/editors/space_console/SConscript @@ -40,7 +40,6 @@ incs = [ '../../blenlib', '../../windowmanager', '../../blenfont', - '../../blenloader', ] if env['WITH_BF_PYTHON']: diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 5b39604809c..d3fb87204fb 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 2eab8c31dc5..8ddeb0ccfe8 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 3e3c6adcf8c..6509af179e7 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../imbuf ../../bmesh ../../makesdna diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 1a60061fd11..268172b300d 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 13e6f9484e8..af2e8476511 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -24,7 +24,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript index f5ac244d50f..ae8e929a684 100644 --- a/source/blender/editors/space_logic/SConscript +++ b/source/blender/editors/space_logic/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index aa3598e8e1f..a74fc3191b7 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_nla/SConscript b/source/blender/editors/space_nla/SConscript index ae82e451c7f..a3063dae946 100644 --- a/source/blender/editors/space_nla/SConscript +++ b/source/blender/editors/space_nla/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index ed37a4c97c7..30c7b5de2f1 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../imbuf ../../gpu ../../makesdna diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 3f69260b25d..94756b96035 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../compositor', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 5a7bbc21934..26fe2edd0d1 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenkernel ../../blenlib ../../blenfont - ../../blenloader ../../imbuf ../../makesdna ../../makesrna diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript index e3c87bd7b8c..db8041f0235 100644 --- a/source/blender/editors/space_outliner/SConscript +++ b/source/blender/editors/space_outliner/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 00f8df299e2..7aa07f4e022 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript index e51838aa124..acb0bf9f20b 100644 --- a/source/blender/editors/space_script/SConscript +++ b/source/blender/editors/space_script/SConscript @@ -35,7 +35,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index f108d9f1aaa..db5729a5762 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../imbuf ../../makesdna ../../makesrna diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 3103754bb4f..5aae30244a7 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 1a6b8eaa753..d848ce33503 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript index 51ce3131800..3f617f95c58 100644 --- a/source/blender/editors/space_text/SConscript +++ b/source/blender/editors/space_text/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 6e51d7829f6..b42ae3ab725 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript index da0c3713851..fb09fe2c11b 100644 --- a/source/blender/editors/space_time/SConscript +++ b/source/blender/editors/space_time/SConscript @@ -35,7 +35,6 @@ incs = [ '../include', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index 2ff683a007c..bd82ef13cd7 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC ../include ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_userpref/SConscript b/source/blender/editors/space_userpref/SConscript index e495085f658..ce2e83f7b33 100644 --- a/source/blender/editors/space_userpref/SConscript +++ b/source/blender/editors/space_userpref/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../imbuf', '../../makesdna', '../../makesrna', diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index a04371a5ed9..7d5cff6a2d0 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../gpu ../../imbuf diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 313711d4e91..e73aa2db49e 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -39,7 +39,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 57864854734..902a9976f48 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -34,7 +34,7 @@ #include <string.h> #include <math.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 6a0701331cc..974006d45db 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -33,7 +33,7 @@ #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "BLO_sys_types.h" /* int64_t */ +#include "BLI_sys_types.h" /* int64_t */ #include "BIF_gl.h" /* bglMats */ #include "BIF_glutil.h" /* bglMats */ diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index ec114bc3019..7765dd511b4 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../ikplugin ../../makesdna diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript index 2f0823955ba..eeefcedd014 100644 --- a/source/blender/editors/transform/SConscript +++ b/source/blender/editors/transform/SConscript @@ -36,7 +36,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../ikplugin', diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index d6b12e05b44..2c548d330c0 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -121,7 +121,7 @@ #include "transform.h" #include "bmesh.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /* local function prototype - for Object/Bone Constraints */ diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index ad1661f6e36..abd19bc3121 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -34,7 +34,7 @@ #include "MEM_guardedalloc.h" -#include "BLO_sys_types.h" /* for intptr_t support */ +#include "BLI_sys_types.h" /* for intptr_t support */ #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index bcc55c4ea6e..ea5e806647f 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib - ../../blenloader ../../bmesh ../../makesdna ../../makesrna diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript index 521854ad21b..120ffc69bc8 100644 --- a/source/blender/editors/util/SConscript +++ b/source/blender/editors/util/SConscript @@ -37,7 +37,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../imbuf', '../../makesdna', diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 695a7cdd0f6..62d4b01cab7 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC ../../blenkernel ../../blenlib ../../blenfont - ../../blenloader ../../bmesh ../../makesdna ../../makesrna diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript index 51e473bc5ba..8b1cbd06f2c 100644 --- a/source/blender/editors/uvedit/SConscript +++ b/source/blender/editors/uvedit/SConscript @@ -39,7 +39,6 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', - '../../blenloader', '../../bmesh', '../../gpu', '../../imbuf', diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 961893aebed..6f92c1873d6 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -46,7 +46,7 @@ #include <stdio.h> #include <string.h> -#include "BLO_sys_types.h" /* for intptr_t support */ +#include "BLI_sys_types.h" /* for intptr_t support */ /* Utils */ diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index dc2fd34e404..7127a436570 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -31,7 +31,7 @@ extern "C" { #endif -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support typedef void ParamHandle; /* handle to a set of charts */ typedef intptr_t ParamKey; /* (hash) key for identifying verts and faces */ diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 71bdb6aaf9e..7ce09aa6882 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -26,9 +26,18 @@ file(GLOB_RECURSE SRC *.cpp *.h) set(INC - ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna - ../python ../python/intern ../render/extern/include ../render/intern/include - ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle + ../blenkernel + ../blenlib + ../freestyle + ../imbuf + ../makesdna + ../makesrna + ../python + ../python/intern + ../render/extern/include + ../render/intern/include + ../../../extern/glew/include + ../../../intern/guardedalloc ) set(INC_SYS diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index eb38b69278e..909165529a8 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -9,7 +9,6 @@ incs = [ '#/extern/glew/include', '../blenkernel', '../blenlib', - '../blenloader', '../freestyle', '../imbuf', '../makesdna', diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 485f5d65853..93c80c68f24 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -27,7 +27,6 @@ set(INC . ../blenkernel ../blenlib - ../blenloader ../bmesh ../imbuf ../makesdna diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index be3d3f5a927..c1c3fa92cb1 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -39,7 +39,6 @@ incs = [ '#/extern/glew/include', '../blenkernel', '../blenlib', - '../blenloader', '../bmesh', '../imbuf', '../include', diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 3b678624eea..39cae4f01ce 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -47,7 +47,7 @@ #include "GPU_material.h" #include "GPU_extensions.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support #include "gpu_codegen.h" diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index b94cfd22058..0028cdb4701 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -29,7 +29,6 @@ set(INC ../.. ../../../blenkernel ../../../blenlib - ../../../blenloader ../../../makesdna ../../../../../intern/guardedalloc ) diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript index d8fc2502081..037a7fec1bc 100644 --- a/source/blender/imbuf/intern/cineon/SConscript +++ b/source/blender/imbuf/intern/cineon/SConscript @@ -31,7 +31,6 @@ source_files = env.Glob('*.c') incs = ['.', '../../../blenkernel', - '../../../blenloader', '../../', '..', '../../../blenlib', diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index 7c75f8b730b..6b1435817d2 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -35,7 +35,7 @@ #include <stdio.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #ifdef __cplusplus diff --git a/source/blender/imbuf/intern/dds/FlipDXT.h b/source/blender/imbuf/intern/dds/FlipDXT.h index 8d0ae8139a1..892c49bc5d2 100644 --- a/source/blender/imbuf/intern/dds/FlipDXT.h +++ b/source/blender/imbuf/intern/dds/FlipDXT.h @@ -23,7 +23,7 @@ #ifndef __FLIPDXT_H__ #define __FLIPDXT_H__ -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" /* flip compressed DXT image vertically to fit OpenGL convention */ int FlipDXTCImage(unsigned int width, unsigned int height, unsigned int levels, int fourcc, uint8_t *data); diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 553a530ecf4..2ae05315c85 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -44,7 +44,7 @@ #include "IMB_allocimbuf.h" #include "IMB_filter.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /************************************************************************/ /* SCALING */ diff --git a/source/blender/makesdna/DNA_defs.h b/source/blender/makesdna/DNA_defs.h index ffe4fc970b1..842543da174 100644 --- a/source/blender/makesdna/DNA_defs.h +++ b/source/blender/makesdna/DNA_defs.h @@ -45,7 +45,7 @@ #endif /* hrmf, we need a better include then this */ -#include "../blenloader/BLO_sys_types.h" /* needed for int64_t only! */ +#include "../blenlib/BLI_sys_types.h" /* needed for int64_t only! */ /* non-id name variables should use this length */ #define MAX_NAME 64 diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 0bd53ec8765..70c79fa393c 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -29,7 +29,6 @@ add_definitions(-DWITH_DNA_GHASH) blender_include_dirs( ../../../../intern/guardedalloc - ../../blenloader ../../blenlib .. ) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 3dada5f0a44..c0db40dcfd2 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -46,7 +46,7 @@ dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', - '../../makesdna', '../../blenloader', '../../bmesh']) + '../../makesdna', '../../bmesh']) if env['OURPLATFORM'] == 'linuxcross': USE_WINE = True # when cross compiling on linux 64bit this is useful diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index da1811656a6..29c977bfe64 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -55,7 +55,7 @@ #include "MEM_guardedalloc.h" #include "DNA_sdna_types.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "../blenlib/BLI_sys_types.h" // for intptr_t support #define SDNA_MAX_FILENAME_LENGTH 255 diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index db0d122df8d..69cb2caf058 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -25,7 +25,7 @@ */ -#include "BLO_sys_types.h" +#include "../blenlib/BLI_sys_types.h" #ifndef __RNA_TYPES_H__ #define __RNA_TYPES_H__ diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 9410bced37b..3b322491559 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -44,7 +44,6 @@ incs = [ '../blenfont', '../blenkernel', '../blenlib', - '../blenloader', '../bmesh', '../editors/include', '../gpu', 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 */ diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 72d9e320eb4..25854ceb2e5 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../blenkernel ../blenlib ../blenfont - ../blenloader ../makesdna ../makesrna ../bmesh diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 92e859a6236..86e1970ab6b 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -38,7 +38,6 @@ incs = [ '#/extern/glew/include', '#/intern/opennl/extern', '../render/extern/include', - '../blenloader', '../bmesh', '../include', '../blenlib', diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.c b/source/blender/modifiers/intern/MOD_meshcache_mdd.c index e001855ba0b..0cbf07ca907 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.c +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.c @@ -28,7 +28,7 @@ #include <string.h> #include <errno.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.c b/source/blender/modifiers/intern/MOD_meshcache_pc2.c index b20f62a8e77..1897454e132 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.c +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.c @@ -28,7 +28,7 @@ #include <string.h> #include <errno.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_endian_switch.h" #include "BLI_fileops.h" diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 5615dfc682b..59f25326edb 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -32,7 +32,6 @@ set(INC ../blenfont ../blenkernel ../blenlib - ../blenloader ../gpu ../imbuf ../makesdna diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index fd4ed027f21..edb9c094121 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -44,7 +44,6 @@ incs = [ '../blenfont', '../blenkernel', '../blenlib', - '../blenloader', '../editors/include', '../gpu', '../imbuf', diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index eb8bd694231..2492de52588 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -22,7 +22,6 @@ set(INC . ../../blenkernel ../../blenlib - ../../blenloader ../../makesdna ../../../../intern/guardedalloc ) diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index e8f8fa51a0a..0c5c4d8a9f1 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -28,7 +28,6 @@ set(INC ../avi ../blenkernel ../blenlib - ../blenloader ../imbuf ../imbuf/intern ../makesdna diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index a32f325de24..a6debf06226 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -47,7 +47,6 @@ incs = ['.', '../avi', '../imbuf', '../imbuf/intern', - '../blenloader', '../render/extern/include', '../editors/include', '#/intern/audaspace/intern'] diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 1aff682eef8..7b42c89d936 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -46,7 +46,7 @@ #include "BLI_blenlib.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 2706895571f..bee26c5348e 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -29,7 +29,7 @@ #include "MEM_guardedalloc.h" #include "IMB_anim.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BKE_global.h" diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 5e114bf7379..ce4f3063082 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -47,7 +47,7 @@ #include "BLI_blenlib.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 7fb14e5da09..511b62d856a 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" #include "IMB_anim.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BKE_global.h" #include "BLI_dynstr.h" #include "BLI_path_util.h" diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 4f1d0d234fc..a907384e19e 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../blenfont ../blenkernel ../blenlib - ../blenloader ../imbuf ../makesdna ../makesrna diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 4303a51f983..ef5c5066426 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -37,7 +37,6 @@ incs = [ '../blenfont', '../blenkernel', '../blenlib', - '../blenloader', '../bmesh', '../imbuf', '../include', diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index b7b0f18b853..42dc9bcdfb2 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -50,7 +50,7 @@ #include "RE_shader_ext.h" /* TexResult, ShadeResult, ShadeInput */ #include "sunsky.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support struct Object; struct MemArena; diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 765f8fbfc31..89c0cde2e88 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -28,11 +28,10 @@ * \ingroup wm */ - #include <string.h> #include <stddef.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index bf48d9e6561..fa7e4afc68c 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -37,7 +37,7 @@ #include "BLI_utildefines.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "DNA_listBase.h" #include "DNA_userdef_types.h" diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript index 2dbb0e00eb0..59a4b18cb0e 100644 --- a/source/blenderplayer/bad_level_call_stubs/SConscript +++ b/source/blenderplayer/bad_level_call_stubs/SConscript @@ -33,7 +33,6 @@ incs = [ '#/intern/guardedalloc', '#/source/blender/makesdna', '#/source/blender/makesrna', - '#/source/blender/blenloader', '#/source/blender/blenlib', ] diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt index df2ad2dffa7..0c7d79b4cda 100644 --- a/source/gameengine/Expressions/CMakeLists.txt +++ b/source/gameengine/Expressions/CMakeLists.txt @@ -26,7 +26,7 @@ set(INC . ../SceneGraph - ../../blender/blenloader + ../../blender/blenlib ../../../intern/guardedalloc ../../../intern/moto/include ../../../intern/string diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index c40394eceb1..1f12a9b78e1 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -25,7 +25,7 @@ #include <algorithm> #include "BoolValue.h" -#include "BLO_sys_types.h" /* for intptr_t support */ +#include "BLI_sys_types.h" /* for intptr_t support */ ////////////////////////////////////////////////////////////////////// diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index a6d82a4f2da..c553aaca2cc 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -29,15 +29,22 @@ Import ('env') sources = env.Glob('*.cpp') -incs ='. #intern/guardedalloc #intern/string #intern/moto/include #source/gameengine/SceneGraph #source/blender/blenloader' +incs = [ + '.', + '#intern/guardedalloc', + '#intern/string', + '#intern/moto/include', + '#source/gameengine/SceneGraph', + '#source/blender/blenlib', + ] defs = [] if env['WITH_BF_PYTHON']: - incs += ' ' + env['BF_PYTHON_INC'] + incs.append(env['BF_PYTHON_INC']) defs.append('WITH_PYTHON') if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') -env.BlenderLib ( 'ge_logic_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib('ge_logic_expressions', sources, incs, defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS']) 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'] diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index 11cb4b1d9f9..d61f90378bb 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../../SceneGraph ../../../blender/blenkernel ../../../blender/blenlib - ../../../blender/blenloader ../../../blender/gpu ../../../blender/makesdna ../../../../intern/container |