[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57132] trunk/blender/source: remove redundant includes from cmake and scons.
Campbell Barton
ideasman42 at gmail.com
Thu May 30 04:16:24 CEST 2013
Revision: 57132
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57132
Author: campbellbarton
Date: 2013-05-30 02:16:22 +0000 (Thu, 30 May 2013)
Log Message:
-----------
remove redundant includes from cmake and scons.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_customdata.h
trunk/blender/source/blender/blenkernel/BKE_pbvh.h
trunk/blender/source/blender/blenkernel/intern/pbvh.c
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenloader/SConscript
trunk/blender/source/blender/editors/animation/SConscript
trunk/blender/source/blender/editors/armature/SConscript
trunk/blender/source/blender/editors/curve/SConscript
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/mesh/SConscript
trunk/blender/source/blender/editors/metaball/SConscript
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_action/SConscript
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/SConscript
trunk/blender/source/blender/editors/space_nla/SConscript
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/SConscript
trunk/blender/source/blender/editors/transform/SConscript
trunk/blender/source/blender/editors/util/SConscript
trunk/blender/source/blender/editors/uvedit/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/render/SConscript
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
Modified: trunk/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_customdata.h 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenkernel/BKE_customdata.h 2013-05-30 02:16:22 UTC (rev 57132)
@@ -38,7 +38,7 @@
extern "C" {
#endif
-#include "BLI_sys_types.h" /* XXX, should have a more generic include for this */
+#include "BLI_sys_types.h"
#include "BLI_utildefines.h"
struct BMesh;
Modified: trunk/blender/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenkernel/BKE_pbvh.h 2013-05-30 02:16:22 UTC (rev 57132)
@@ -30,9 +30,6 @@
#include "BLI_ghash.h"
#include "BLI_utildefines.h"
-/* Needed for BMesh functions used in the PBVH iterator macro */
-#include "bmesh.h"
-
struct CCGElem;
struct CCGKey;
struct CustomData;
@@ -43,6 +40,8 @@
struct MVert;
struct PBVH;
struct PBVHNode;
+struct BMesh;
+struct BMLog;
typedef struct PBVH PBVH;
typedef struct PBVHNode PBVHNode;
@@ -123,7 +122,7 @@
void BKE_pbvh_get_grid_key(const PBVH *pbvh, struct CCGKey *key);
/* Only valid for type == PBVH_BMESH */
-BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
+struct BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh);
void BKE_pbvh_bmesh_detail_size_set(PBVH *pbvh, float detail_size);
typedef enum {
@@ -329,4 +328,3 @@
void pbvh_show_diffuse_color_set(PBVH *bvh, int show_diffuse_color);
#endif /* __BKE_PBVH_H__ */
-
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh.c 2013-05-30 02:16:22 UTC (rev 57132)
@@ -41,6 +41,8 @@
#include "GPU_buffers.h"
+#include "bmesh.h"
+
#include "pbvh_intern.h"
#define LEAF_LIMIT 10000
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-05-30 02:16:22 UTC (rev 57132)
@@ -29,7 +29,6 @@
.
# ../blenkernel # dont add this back!
../makesdna
- ../makesrna
../../../intern/ghost
../../../intern/guardedalloc
../../../extern/wcwidth
Modified: trunk/blender/source/blender/blenloader/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenloader/CMakeLists.txt 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenloader/CMakeLists.txt 2013-05-30 02:16:22 UTC (rev 57132)
@@ -28,12 +28,12 @@
../blenfont
../blenkernel
../blenlib
+ ../imbuf
../makesdna
../makesrna
../nodes
../render/extern/include
../../../intern/guardedalloc
- ../imbuf
)
set(INC_SYS
Modified: trunk/blender/source/blender/blenloader/SConscript
===================================================================
--- trunk/blender/source/blender/blenloader/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/blenloader/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -35,8 +35,6 @@
'../blenfont',
'../blenkernel',
'../blenlib',
- '../bmesh',
- '../editors/include',
'../imbuf',
'../makesdna',
'../makesrna',
Modified: trunk/blender/source/blender/editors/animation/SConscript
===================================================================
--- trunk/blender/source/blender/editors/animation/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/animation/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -36,8 +36,6 @@
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../bmesh',
- '../../imbuf',
'../../makesdna',
'../../makesrna',
'../../windowmanager',
Modified: trunk/blender/source/blender/editors/armature/SConscript
===================================================================
--- trunk/blender/source/blender/editors/armature/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/armature/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -37,12 +37,8 @@
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../bmesh',
- '../../gpu',
- '../../imbuf',
'../../makesdna',
'../../makesrna',
- '../../render/extern/include',
'../../windowmanager',
]
incs = ' '.join(incs)
Modified: trunk/blender/source/blender/editors/curve/SConscript
===================================================================
--- trunk/blender/source/blender/editors/curve/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/curve/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -33,15 +33,10 @@
incs = [
'#/intern/guardedalloc',
- '#/extern/glew/include',
- '#/intern/elbeem/extern',
'../include',
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../bmesh',
- '../../gpu',
- '../../imbuf',
'../../makesdna',
'../../makesrna',
'../../render/extern/include',
Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c 2013-05-30 02:16:22 UTC (rev 57132)
@@ -269,4 +269,3 @@
ED_keymap_proportional_cycle(keyconf, keymap);
ED_keymap_proportional_editmode(keyconf, keymap, TRUE);
}
-
Modified: trunk/blender/source/blender/editors/interface/SConscript
===================================================================
--- trunk/blender/source/blender/editors/interface/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/interface/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -36,7 +36,6 @@
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../bmesh',
'../../gpu',
'../../imbuf',
'../../makesdna',
Modified: trunk/blender/source/blender/editors/mesh/SConscript
===================================================================
--- trunk/blender/source/blender/editors/mesh/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/mesh/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -34,7 +34,6 @@
incs = [
'#/intern/guardedalloc',
'#/extern/glew/include',
- '#/intern/elbeem/extern',
'../include',
'../uvedit',
'../../blenfont',
Modified: trunk/blender/source/blender/editors/metaball/SConscript
===================================================================
--- trunk/blender/source/blender/editors/metaball/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/metaball/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -31,13 +31,9 @@
incs = [
'#/intern/guardedalloc',
- '#/extern/glew/include',
- '#/intern/elbeem/extern',
'../include',
'../../blenkernel',
'../../blenlib',
- '../../gpu',
- '../../imbuf',
'../../makesdna',
'../../makesrna',
'../../render/extern/include',
Modified: trunk/blender/source/blender/editors/physics/SConscript
===================================================================
--- trunk/blender/source/blender/editors/physics/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/physics/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -38,12 +38,8 @@
'../../blenfont',
'../../blenkernel',
'../../blenlib',
- '../../bmesh',
- '../../gpu',
- '../../imbuf',
'../../makesdna',
'../../makesrna',
- '../../render/extern/include',
'../../windowmanager',
]
incs = ' '.join(incs)
Modified: trunk/blender/source/blender/editors/screen/SConscript
===================================================================
--- trunk/blender/source/blender/editors/screen/SConscript 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/screen/SConscript 2013-05-30 02:16:22 UTC (rev 57132)
@@ -41,7 +41,6 @@
'../../imbuf',
'../../makesdna',
'../../makesrna',
- '../../render/extern/include',
'../../windowmanager',
]
incs = ' '.join(incs)
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_cursor.c 2013-05-30 02:16:22 UTC (rev 57132)
@@ -35,6 +35,7 @@
#include "BLI_utildefines.h"
#include "DNA_brush_types.h"
+#include "DNA_customdata_types.h"
#include "DNA_color_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_hide.c 2013-05-30 02:16:22 UTC (rev 57132)
@@ -64,6 +64,8 @@
#include "RNA_access.h"
#include "RNA_define.h"
+#include "bmesh.h"
+
#include "paint_intern.h"
#include "sculpt_intern.h" /* for undo push */
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-05-29 21:56:55 UTC (rev 57131)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-05-30 02:16:22 UTC (rev 57132)
@@ -54,6 +54,8 @@
#include "ED_screen.h"
#include "ED_sculpt.h"
+#include "bmesh.h"
+
#include "paint_intern.h"
#include "sculpt_intern.h" /* for undo push */
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c 2013-05-29 21:56:55 UTC (rev 57131)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list