[Bf-blender-cvs] [5621e63] master: Code cleanup: duplicate headers
Campbell Barton
noreply at git.blender.org
Fri Feb 14 00:56:32 CET 2014
Commit: 5621e63d36c525f6acd744e2ddae3a73f2c3b453
Author: Campbell Barton
Date: Fri Feb 14 10:55:19 2014 +1100
https://developer.blender.org/rB5621e63d36c525f6acd744e2ddae3a73f2c3b453
Code cleanup: duplicate headers
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/collision.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/world.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_clip/clip_dopesheet_draw.c
M source/blender/editors/space_clip/clip_utils.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/space_node/space_node.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/editors/space_sequencer/sequencer_modifier.c
M source/blender/editors/space_view3d/drawmesh.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/imbuf/intern/indexer.c
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/intern/rna_define.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/modifiers/intern/MOD_fluidsim_util.c
M source/blender/nodes/intern/node_socket.c
M source/blender/python/intern/bpy_interface.c
M source/blender/render/intern/source/convertblender.c
M source/blender/render/intern/source/render_texture.c
M source/gameengine/Converter/KX_BlenderSceneConverter.cpp
M source/gameengine/Converter/KX_ConvertSensors.cpp
M source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
M source/gameengine/Ketsji/KX_GameObject.cpp
M source/gameengine/Ketsji/KX_PythonInit.cpp
M source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index c59044d..8ba6784 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -64,7 +64,6 @@
#include "BKE_multires.h"
#include "BKE_armature.h"
#include "BKE_particle.h"
-#include "BKE_editmesh.h"
#include "BKE_bvhutils.h"
#include "BKE_deform.h"
#include "BKE_global.h" /* For debug flag, DM_update_tessface_data() func. */
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 04bd8d3..b40e04d 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -39,7 +39,6 @@
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
-#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "BLI_scanfill.h"
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 0f6d414..acafa76 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -38,7 +38,6 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
#include "BLI_edgehash.h"
-#include "BLI_utildefines.h"
#include "BLI_linklist.h"
#include "BKE_cdderivedmesh.h"
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index e3081b9..3936321 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -44,7 +44,6 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_edgehash.h"
-#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_memarena.h"
#include "BLI_rand.h"
@@ -57,7 +56,6 @@
#include "BKE_object.h"
#include "BKE_scene.h"
-#include "BKE_DerivedMesh.h"
#ifdef WITH_BULLET
#include "Bullet-C-Api.h"
#endif
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index c14e8dd..1397a7d 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -81,7 +81,6 @@
#include "BKE_idprop.h"
#include "BKE_mesh.h"
#include "BKE_shrinkwrap.h"
-#include "BKE_mesh.h"
#include "BKE_editmesh.h"
#include "BKE_tracking.h"
#include "BKE_movieclip.h"
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index e5565e8..fffd115 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -49,7 +49,6 @@
#include "BLI_path_util.h"
#include "BLI_math.h"
#include "BLI_mempool.h"
-#include "BLI_utildefines.h"
#include "BLI_alloca.h"
#include "BLF_translation.h"
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 93833f5..9dbaaa9 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -61,7 +61,6 @@
#include "BKE_editmesh.h"
#include "BKE_main.h"
#include "BKE_object.h"
-#include "BKE_deform.h"
#include "BKE_scene.h"
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 27a8730..d622556 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -41,7 +41,6 @@
#include "DNA_lamp_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
-#include "DNA_node_types.h"
#include "DNA_scene_types.h"
#include "DNA_texture_types.h"
#include "DNA_world_types.h"
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index af8cf62..0104efb 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -45,7 +45,6 @@
#include "BKE_global.h"
#include "BKE_icons.h"
#include "BKE_library.h"
-#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_world.h"
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f41baf5..cfc5092 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -103,7 +103,6 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
#include "BLI_endian_switch.h"
#include "BLI_blenlib.h"
#include "BLI_math.h"
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 129e980..854e9d8 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -145,7 +145,6 @@
#include "BLI_blenlib.h"
#include "BLI_linklist.h"
#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "BLI_mempool.h"
#include "BKE_action.h"
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 990af78..edbe170 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -44,8 +44,6 @@
#include "BKE_context.h"
#include "BKE_screen.h"
-#include "ED_screen.h"
-
#include "BIF_gl.h"
#include "WM_api.h"
diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.c b/source/blender/editors/space_clip/clip_dopesheet_draw.c
index 3ada57a..288e658 100644
--- a/source/blender/editors/space_clip/clip_dopesheet_draw.c
+++ b/source/blender/editors/space_clip/clip_dopesheet_draw.c
@@ -39,7 +39,6 @@
#include "BLI_math.h"
#include "BLI_string.h"
#include "BLI_listbase.h"
-#include "BLI_math.h"
#include "BLI_rect.h"
#include "BKE_context.h"
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index 4b90fa5..bedd576 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -54,8 +54,6 @@
#include "ED_screen.h"
#include "ED_clip.h"
-#include "UI_interface.h"
-
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 582e686..5603650 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -49,12 +49,9 @@
#include "BLF_api.h"
#include "BLF_translation.h"
-#include "NOD_texture.h"
-
#include "BIF_gl.h"
#include "BIF_glutil.h"
-#include "BLF_translation.h"
#include "MEM_guardedalloc.h"
#include "RNA_access.h"
diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c
index 50904ed..c93dd7e 100644
--- a/source/blender/editors/space_node/node_view.c
+++ b/source/blender/editors/space_node/node_view.c
@@ -44,8 +44,6 @@
#include "ED_space_api.h"
#include "ED_image.h"
-#include "UI_view2d.h"
-
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index b8bb196..ae6e09d 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -49,7 +49,6 @@
#include "ED_node.h"
#include "ED_render.h"
#include "ED_screen.h"
-#include "ED_node.h"
#include "WM_api.h"
#include "WM_types.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index fcd8acd..156df05 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -57,7 +57,6 @@
#include "BKE_main.h"
#include "BKE_sequencer.h"
#include "BKE_movieclip.h"
-#include "BKE_sequencer.h"
#include "BKE_mask.h"
#include "BKE_report.h"
diff --git a/source/blender/editors/space_sequencer/sequencer_modifier.c b/source/blender/editors/space_sequencer/sequencer_modifier.c
index c8fd6e4..9850c7c 100644
--- a/source/blender/editors/space_sequencer/sequencer_modifier.c
+++ b/source/blender/editors/space_sequencer/sequencer_modifier.c
@@ -45,7 +45,6 @@
#include "BKE_main.h"
#include "BKE_sequencer.h"
#include "BKE_movieclip.h"
-#include "BKE_sequencer.h"
#include "BKE_mask.h"
#include "BKE_report.h"
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 681d5ca..04b2b4c 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -36,7 +36,6 @@
#include "BLI_blenlib.h"
#include "BLI_bitmap.h"
#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "DNA_material_types.h"
#include "DNA_mesh_types.h"
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index c0a5e50..75b1248 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -48,8 +48,8 @@
#include "BLI_math.h"
#include "BLI_edgehash.h"
#include "BLI_uvproject.h"
-#include "BLI_utildefines.h"
#include "BLI_string.h"
+#include "BLI_scanfill.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_subsurf.h"
@@ -63,11 +63,6 @@
#include "BKE_scene.h"
#include "BKE_editmesh.h"
-#include "BLI_math.h"
-#include "BLI_edgehash.h"
-#include "BLI_scanfill.h"
-#include "BLI_uvproject.h"
-
#include "PIL_time.h"
#include "ED_image.h"
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index e452227..3eaf42b 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -34,7 +34,6 @@
#include "BLI_endian_switch.h"
#include "BLI_path_util.h"
#include "BLI_string.h"
-#include "BLI_path_util.h"
#include "BLI_fileops.h"
#include "BLI_math_base.h"
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 1710f9e..d95c394 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -53,7 +53,6 @@
#include <stdio.h>
#include "MEM_guardedalloc.h"
-#include "DNA_sdna_types.h"
#include "../blenlib/BLI_sys_types.h" // for intptr_t support
diff --git a/source/blender/makesrna/intern/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list