[Bf-blender-cvs] [2240c26] master: Cleanup: duplicate headers

Campbell Barton noreply at git.blender.org
Thu Nov 27 23:19:41 CET 2014


Commit: 2240c260c1b58f18e05f5c976ff03b0c039edc79
Author: Campbell Barton
Date:   Thu Nov 27 23:24:13 2014 +0100
Branches: master
https://developer.blender.org/rB2240c260c1b58f18e05f5c976ff03b0c039edc79

Cleanup: duplicate headers

===================================================================

M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/editors/sculpt_paint/paint_utils.c
M	source/blender/makesrna/intern/rna_render.c
M	source/blender/python/intern/bpy.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index fb442f1..372a0b0 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -49,13 +49,11 @@
 
 #include "DNA_genfile.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
 #include "BKE_main.h"
 #include "BKE_node.h"
 
 #include "BLI_math.h"
+#include "BLI_listbase.h"
 #include "BLI_string.h"
 
 #include "BLO_readfile.h"
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c
index d41af26..2ec1ca6 100644
--- a/source/blender/editors/sculpt_paint/paint_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_utils.c
@@ -56,7 +56,6 @@
 #include "BKE_image.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
-#include "BKE_image.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -66,6 +65,7 @@
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
 
 #include "RE_shader_ext.h"
 #include "RE_render_ext.h"
@@ -74,9 +74,6 @@
 #include "ED_screen.h"
 #include "ED_uvedit.h"
 
-#include "IMB_imbuf_types.h"
-#include "IMB_imbuf.h"
-
 #include "BLI_sys_types.h"
 #include "ED_mesh.h" /* for face mask functions */
 
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 0ee654d..5d4ec06 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -38,7 +38,6 @@
 
 #include "RE_engine.h"
 #include "RE_pipeline.h"
-#include "RE_engine.h"
 
 
 EnumPropertyItem render_pass_type_items[] = {
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index d7c07df..0ec7bc7 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -59,7 +59,6 @@
 #include "../generic/idprop_py_api.h"
 #include "../generic/bgl.h"
 #include "../generic/blf_py_api.h"
-#include "../generic/blf_py_api.h"
 #include "../mathutils/mathutils.h"
 
 #ifdef WITH_FREESTYLE




More information about the Bf-blender-cvs mailing list