forked from bartvdbraak/blender
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
This commit is contained in:
parent
60befcdc62
commit
225c5fee6b
2
extern/carve/include/carve/win32.h
vendored
2
extern/carve/include/carve/win32.h
vendored
@ -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;
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include "MEM_sys_types.h"
|
||||
#include "../../source/blender/blenlib/BLI_sys_types.h"
|
||||
|
||||
enum {
|
||||
empty_tag = 0x0,
|
||||
|
@ -10,7 +10,6 @@ set(INC
|
||||
../../mikktspace
|
||||
../../../source/blender/makesdna
|
||||
../../../source/blender/makesrna
|
||||
../../../source/blender/blenloader
|
||||
${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
|
||||
)
|
||||
|
||||
|
@ -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"
|
||||
|
@ -35,7 +35,6 @@ set(SRC
|
||||
./intern/mallocn.c
|
||||
|
||||
MEM_guardedalloc.h
|
||||
MEM_sys_types.h
|
||||
)
|
||||
|
||||
if(WIN32 AND NOT UNIX)
|
||||
|
@ -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))
|
||||
|
@ -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__ */
|
@ -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);
|
||||
|
@ -30,7 +30,6 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include "guardedalloc/MEM_guardedalloc.h"
|
||||
#include "guardedalloc/MEM_sys_types.h"
|
||||
|
||||
template<typename _Tp>
|
||||
struct MEM_Allocator
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -32,7 +32,6 @@ SConscript(['avi/SConscript',
|
||||
'bmesh/SConscript',
|
||||
'blenkernel/SConscript',
|
||||
'blenlib/SConscript',
|
||||
'blenloader/SConscript',
|
||||
'gpu/SConscript',
|
||||
'editors/SConscript',
|
||||
'imbuf/SConscript',
|
||||
|
@ -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 {
|
||||
|
@ -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"
|
||||
|
||||
|
@ -25,7 +25,6 @@ set(INC
|
||||
.
|
||||
../blenkernel
|
||||
../blenlib
|
||||
../blenloader
|
||||
../editors/include
|
||||
../makesdna
|
||||
../makesrna
|
||||
|
@ -38,7 +38,6 @@ incs = [
|
||||
'#/extern/glew/include',
|
||||
'../blenkernel',
|
||||
'../blenlib',
|
||||
'../blenloader',
|
||||
'../editors/include',
|
||||
'../imbuf',
|
||||
'../makesdna',
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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
|
||||
|
@ -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__
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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".
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -30,7 +30,6 @@ set(INC
|
||||
../blenkernel
|
||||
../blenlib
|
||||
../blenfont
|
||||
../blenloader
|
||||
../editors/include
|
||||
../makesdna
|
||||
../makesrna
|
||||
|
@ -39,7 +39,6 @@ incs = [
|
||||
'../blenfont',
|
||||
'../blenkernel',
|
||||
'../windowmanager',
|
||||
'../blenloader',
|
||||
'../makesdna',
|
||||
'../makesrna',
|
||||
'../editors/include',
|
||||
|
@ -31,7 +31,6 @@ set(INC
|
||||
../blenkernel
|
||||
../blenlib
|
||||
../blenlib
|
||||
../blenloader
|
||||
../imbuf
|
||||
../makesdna
|
||||
../makesrna
|
||||
|
@ -38,7 +38,6 @@ incs = [
|
||||
'#/intern/opencl',
|
||||
'../blenkernel',
|
||||
'../blenlib',
|
||||
'../blenloader',
|
||||
'../imbuf',
|
||||
'../makesdna',
|
||||
'../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
|
@ -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"
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "BLO_sys_types.h"
|
||||
#include "BLI_sys_types.h"
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -39,7 +39,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -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"
|
||||
|
@ -32,7 +32,7 @@
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "BLO_sys_types.h"
|
||||
#include "BLI_sys_types.h"
|
||||
|
||||
#include "BLI_blenlib.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"
|
||||
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../gpu
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../collada',
|
||||
'../../makesrna',
|
||||
'../../windowmanager',
|
||||
|
@ -24,7 +24,6 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenlib
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
'../../windowmanager',
|
||||
|
@ -24,7 +24,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../gpu
|
||||
../../imbuf
|
||||
|
@ -40,7 +40,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../render/extern/include
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../gpu
|
||||
../../ikplugin
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../ikplugin',
|
||||
|
@ -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"
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -38,7 +38,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../gpu
|
||||
../../imbuf
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -24,7 +24,6 @@ set(INC
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenfont
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../gpu
|
||||
../../imbuf
|
||||
|
@ -39,7 +39,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -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"
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -35,7 +35,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -35,7 +35,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../io
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../bmesh
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../io',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
|
@ -24,7 +24,6 @@
|
||||
set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../blenfont
|
||||
../../blenlib
|
||||
../../imbuf
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -40,7 +40,6 @@ incs = [
|
||||
'../../blenlib',
|
||||
'../../windowmanager',
|
||||
'../../blenfont',
|
||||
'../../blenloader',
|
||||
]
|
||||
|
||||
if env['WITH_BF_PYTHON']:
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../bmesh
|
||||
../../makesdna
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../bmesh',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
|
@ -24,7 +24,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../gpu
|
||||
../../makesdna
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../compositor',
|
||||
'../../gpu',
|
||||
'../../imbuf',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenfont
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -35,7 +35,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../imbuf
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
|
@ -37,7 +37,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -23,7 +23,6 @@ set(INC
|
||||
../../blenfont
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -35,7 +35,6 @@ incs = [
|
||||
'../include',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
@ -22,7 +22,6 @@ set(INC
|
||||
../include
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../blenloader
|
||||
../../makesdna
|
||||
../../makesrna
|
||||
../../windowmanager
|
||||
|
@ -36,7 +36,6 @@ incs = [
|
||||
'../../blenfont',
|
||||
'../../blenkernel',
|
||||
'../../blenlib',
|
||||
'../../blenloader',
|
||||
'../../imbuf',
|
||||
'../../makesdna',
|
||||
'../../makesrna',
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user