[Bf-blender-cvs] [3ce4a58] master: Cleanup: duplicate includes
Campbell Barton
noreply at git.blender.org
Wed Jun 17 22:36:18 CEST 2015
Commit: 3ce4a58aa90d93d1d0f1ec5dcc63a482d1b1af78
Author: Campbell Barton
Date: Thu Jun 18 06:11:02 2015 +1000
Branches: master
https://developer.blender.org/rB3ce4a58aa90d93d1d0f1ec5dcc63a482d1b1af78
Cleanup: duplicate includes
===================================================================
M source/blender/blenkernel/intern/appdir.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
M source/blender/editors/space_info/info_draw.c
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/indexer.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_image_api.c
M source/blender/makesrna/intern/rna_key.c
M source/blender/makesrna/intern/rna_mask.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_sequencer_api.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/nodes/texture/node_texture_util.h
M source/blender/python/generic/blf_py_api.c
M source/blender/python/generic/idprop_py_api.c
M source/blender/python/generic/py_capi_utils.c
M source/blender/python/intern/bpy_interface.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils.c
===================================================================
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index b1b32e7..2331869 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -32,12 +32,11 @@
#include "BLI_fileops.h"
#include "BLI_path_util.h"
+#include "BKE_blender.h" /* BLENDER_VERSION */
#include "BKE_appdir.h" /* own include */
#include "GHOST_Path-api.h"
-#include "../blenkernel/BKE_blender.h" /* BLENDER_VERSION, bad level include (no function call) */
-
#include "MEM_guardedalloc.h"
#ifdef WIN32
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 37c2556..6ab655e 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -27,7 +27,6 @@
#include "BLI_utildefines.h"
#include "BLI_compiler_attrs.h"
-#include "BLI_string.h"
/* for MinGW32 definition of NULL, could use BLI_blenlib.h instead too */
#include <stddef.h>
@@ -49,7 +48,6 @@
#include "DNA_particle_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_actuator_types.h"
-#include "DNA_camera_types.h"
#include "DNA_view3d_types.h"
#include "DNA_genfile.h"
@@ -60,7 +58,6 @@
#include "BKE_scene.h"
#include "BKE_sequencer.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "BLI_math.h"
#include "BLI_listbase.h"
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 74c1128..5cb757d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -32,7 +32,6 @@
#include "COM_ExecutionSystem.h"
#include "COM_ReadBufferOperation.h"
#include "COM_WriteBufferOperation.h"
-#include "COM_ReadBufferOperation.h"
#include "COM_WorkScheduler.h"
#include "COM_ViewerOperation.h"
#include "COM_ChunkOrder.h"
diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
index 71e6ab1..653100c 100644
--- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
+++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
@@ -20,7 +20,6 @@
*/
#include "COM_Node.h"
-#include "DNA_node_types.h"
extern "C" {
# include "DNA_movieclip_types.h"
diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c
index e289510..cd424f4 100644
--- a/source/blender/editors/space_info/info_draw.c
+++ b/source/blender/editors/space_info/info_draw.c
@@ -50,7 +50,7 @@
#include "UI_view2d.h"
#include "info_intern.h"
-#include "../space_info/textview.h"
+#include "textview.h"
/* complicates things a bit, so leaving in old simple code */
#define USE_INFO_NEWLINE
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 1fc43e2..690ec81 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -79,11 +79,7 @@
#endif
#ifdef WITH_REDCODE
-# ifdef _WIN32 /* on windows we use the one in extern instead */
-# include "libredcode/format.h"
-# else
-# include "libredcode/format.h"
-# endif
+# include "libredcode/format.h"
#endif
#include "IMB_imbuf_types.h"
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 2c8431d..e2d56d2 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -99,13 +99,8 @@
#endif //WITH_FFMPEG
#ifdef WITH_REDCODE
-#ifdef _WIN32 /* on windows we use the ones in extern instead */
-#include "libredcode/format.h"
-#include "libredcode/codec.h"
-#else
-#include "libredcode/format.h"
-#include "libredcode/codec.h"
-#endif
+# include "libredcode/format.h"
+# include "libredcode/codec.h"
#endif
#include "IMB_colormanagement.h"
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 0509dea..ac57b09 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -41,7 +41,6 @@
#include "IMB_anim.h"
#include "imbuf.h"
-#include "MEM_guardedalloc.h"
#include "BKE_global.h"
#ifdef WITH_AVI
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index e9e4282..b03b099 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -111,8 +111,6 @@ EnumPropertyItem brush_image_tool_items[] = {
#include "MEM_guardedalloc.h"
-#include "DNA_object_types.h"
-
#include "RNA_access.h"
#include "BKE_texture.h"
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 9a9ac28..fc028a4 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -46,9 +46,6 @@
#include "WM_types.h"
-#include "BKE_curve.h"
-#include "ED_curve.h"
-
#ifndef RNA_RUNTIME
static EnumPropertyItem beztriple_handle_type_items[] = {
{HD_FREE, "FREE", 0, "Free", ""},
@@ -124,8 +121,6 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = {
#ifdef RNA_RUNTIME
-#include "BLI_math.h"
-
#include "DNA_object_types.h"
#include "BKE_curve.h"
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 9453595..c3c152a 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -56,7 +56,6 @@
#include "IMB_imbuf.h"
#include "IMB_colormanagement.h"
-#include "BIF_gl.h"
#include "GPU_draw.h"
#include "GPU_debug.h"
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index 249d132..04cba83 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -48,7 +48,6 @@
#include <stddef.h>
#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
#include "BKE_animsys.h"
#include "BKE_depsgraph.h"
diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index 4144872..b660236 100644
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -52,12 +52,10 @@
#ifdef RNA_RUNTIME
-#include "DNA_mask_types.h"
#include "DNA_movieclip_types.h"
#include "BKE_depsgraph.h"
#include "BKE_mask.h"
-#include "BKE_tracking.h"
#include "BLI_math.h"
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index d51ec2b..ec64aa3 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -75,7 +75,6 @@ EnumPropertyItem mesh_delimit_mode_items[] = {
#include "ED_mesh.h" /* XXX Bad level call */
#include "WM_api.h"
-#include "WM_types.h"
#include "rna_mesh_utils.h"
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index d0cb0b9..19db101 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -30,7 +30,6 @@
#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "BLI_string.h"
#include "BLI_utildefines.h"
#include "BLF_translation.h"
@@ -39,7 +38,6 @@
#include "DNA_mesh_types.h"
#include "DNA_node_types.h"
#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
#include "DNA_text_types.h"
#include "DNA_texture_types.h"
@@ -48,7 +46,6 @@
#include "BKE_node.h"
#include "BKE_image.h"
#include "BKE_texture.h"
-#include "BKE_idprop.h"
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 2ef5c6e..c6a6136 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -46,7 +46,6 @@
#include "BKE_paint.h"
#include "BKE_editmesh.h"
#include "BKE_group.h" /* needed for BKE_group_object_exists() */
-#include "BKE_object.h" /* Needed for BKE_object_matrix_local_get() */
#include "BKE_object_deform.h"
#include "RNA_access.h"
@@ -202,7 +201,6 @@ EnumPropertyItem object_axis_unsigned_items[] = {
#include "BKE_scene.h"
#include "BKE_deform.h"
-#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_particle.h"
#include "ED_curve.h"
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 3ff5142..afbb97f 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -109,8 +109,6 @@ EnumPropertyItem color_sets_items[] = {
#include "ED_object.h"
#include "ED_armature.h"
-#include "MEM_guardedalloc.h"
-
#include "WM_api.h"
#include "RNA_access.h"
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 42e231f..4650e27 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -105,7 +105,6 @@ EnumPropertyItem property_unit_items[] = {
#ifdef RNA_RUNTIME
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
#include "BLI_ghash.h"
/* Struct */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 87118e2..0986c50 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -42,10 +42,8 @@
#include "BLF_translation.h"
-#include "BKE_freestyle.h"
#include "BKE_editmesh.h"
#include "BKE_paint.h"
-#include "BKE_scene.h"
#include "GPU_extensions.h"
@@ -407,8 +405,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
#include "MEM_guardedalloc.h"
-#include "BLI_threads.h"
-
#include "BKE_brush.h"
#include "BKE_context.h"
#include "BKE_global.h"
@@ -418,7 +414,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_depsgraph.h"
-#include "BKE_image.h"
#include "BKE_mesh.h"
#include "BKE_sound.h"
#include "BKE_screen.h"
@@ -426,8 +421,6 @@ EnumPropertyItem stereo3d_interlace_type_items[] = {
#include "BKE_ani
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list