diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
| commit | 225c5fee6b046b9829643f82cf6cbce159e4e007 (patch) | |
| tree | 4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/blender/editors | |
| parent | 60befcdc6297281ce226273123d3ccfc0a681aff (diff) | |
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/blender/editors')
81 files changed, 13 insertions, 81 deletions
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 */ |