[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55825] trunk/blender/source/blender: code cleanup: include order
Campbell Barton
ideasman42 at gmail.com
Fri Apr 5 19:56:55 CEST 2013
Revision: 55825
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55825
Author: campbellbarton
Date: 2013-04-05 17:56:54 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
code cleanup: include order
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenloader/intern/runtime.c
trunk/blender/source/blender/blenloader/intern/undofile.c
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/gpencil/gpencil_undo.c
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_file/file_panels.c
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/makesrna/intern/rna_cloth.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_script.c
trunk/blender/source/blender/python/intern/bpy_library.c
Modified: trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -7,15 +7,15 @@
#include <string.h>
#include <math.h>
-#include "BKE_ccg.h"
-#include "CCGSubSurf.h"
-#include "BKE_subsurf.h"
-
#include "MEM_guardedalloc.h"
#include "BLO_sys_types.h" // for intptr_t support
#include "BLI_utildefines.h" /* for BLI_assert */
+#include "BKE_ccg.h"
+#include "CCGSubSurf.h"
+#include "BKE_subsurf.h"
+
/* used for normalize_v3 in BLI_math_vector
* float.h's FLT_EPSILON causes trouble with subsurf normals - campbell */
#define EPSILON (1.0e-35f)
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -32,8 +32,6 @@
#include "MEM_guardedalloc.h"
-#include "BKE_cloth.h"
-
#include "DNA_cloth_types.h"
#include "DNA_group_types.h"
#include "DNA_mesh_types.h"
@@ -52,11 +50,12 @@
#include "BLI_rand.h"
#include "BKE_DerivedMesh.h"
+#include "BKE_cloth.h"
#include "BKE_global.h"
-#include "BKE_scene.h"
#include "BKE_mesh.h"
-#include "BKE_object.h"
#include "BKE_modifier.h"
+#include "BKE_object.h"
+#include "BKE_scene.h"
#include "BKE_DerivedMesh.h"
#ifdef WITH_BULLET
Modified: trunk/blender/source/blender/blenloader/intern/runtime.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/runtime.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/blenloader/intern/runtime.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -45,12 +45,12 @@
# include <unistd.h> // read
#endif
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
+
#include "BLO_readfile.h"
#include "BLO_runtime.h"
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
#include "BKE_blender.h"
#include "BKE_report.h"
Modified: trunk/blender/source/blender/blenloader/intern/undofile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/undofile.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/blenloader/intern/undofile.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -30,7 +30,6 @@
* \ingroup blenloader
*/
-
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@ -40,14 +39,11 @@
#include "DNA_listBase.h"
-
-#include "BLO_undofile.h"
-
#include "BLI_blenlib.h"
#include "BLI_linklist.h"
+#include "BLO_undofile.h"
-
/* **************** support for memory-write, for undo buffers *************** */
/* not memfile itself */
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -36,12 +36,12 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
+#include "BLI_array.h"
+#include "BLI_math.h"
+
#include "BKE_customdata.h"
#include "BKE_multires.h"
-#include "BLI_array.h"
-#include "BLI_math.h"
-
#include "bmesh.h"
#include "intern/bmesh_private.h"
Modified: trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/bmesh/operators/bmo_join_triangles.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -33,11 +33,11 @@
#include "DNA_meshdata_types.h"
-#include "BKE_customdata.h"
-
#include "BLI_math.h"
#include "BLI_array.h"
+#include "BKE_customdata.h"
+
#include "bmesh.h"
#include "intern/bmesh_operators_private.h" /* own include */
Modified: trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp 2013-04-05 17:56:54 UTC (rev 55825)
@@ -23,8 +23,6 @@
#include <list>
#include <stdio.h>
-#include "BKE_global.h"
-
#include "COM_compositor.h"
#include "COM_WorkScheduler.h"
#include "COM_CPUDevice.h"
@@ -38,6 +36,8 @@
#include "PIL_time.h"
#include "BLI_threads.h"
+#include "BKE_global.h"
+
#if COM_CURRENT_THREADING_MODEL == COM_TM_NOTHREAD
# ifndef DEBUG /* test this so we dont get warnings in debug builds */
# warning COM_CURRENT_THREADING_MODEL COM_TM_NOTHREAD is activated. Use only for debugging.
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -26,13 +26,13 @@
#include "MEM_guardedalloc.h"
-#include "BKE_context.h"
-
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_edgehash.h"
#include "BLI_ghash.h"
+#include "BKE_context.h"
+
#include "reeb.h"
#if 0 /* UNUSED 2.5 */
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_undo.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_undo.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_undo.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -38,12 +38,12 @@
#include "DNA_listBase.h"
#include "DNA_windowmanager_types.h"
+#include "BLI_listbase.h"
+
#include "BKE_blender.h"
#include "BKE_context.h"
#include "BKE_gpencil.h"
-#include "BLI_listbase.h"
-
#include "ED_gpencil.h"
#include "WM_api.h"
Modified: trunk/blender/source/blender/editors/include/UI_resources.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_resources.h 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/include/UI_resources.h 2013-04-05 17:56:54 UTC (rev 55825)
@@ -308,4 +308,4 @@
void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis);
-#endif /* UI_RESOURCES_H */
+#endif /* __UI_RESOURCES_H__ */
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -43,13 +43,13 @@
#endif
#include "MEM_guardedalloc.h"
-#include "BLO_readfile.h"
-
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_threads.h"
#include "BLI_utildefines.h"
+#include "BLO_readfile.h"
+
#include "DNA_world_types.h"
#include "DNA_camera_types.h"
#include "DNA_material_types.h"
Modified: trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -35,10 +35,6 @@
#include "MEM_guardedalloc.h"
-#include "BKE_context.h"
-#include "BKE_movieclip.h"
-#include "BKE_tracking.h"
-
#include "BLI_utildefines.h"
#include "BLI_math.h"
#include "BLI_string.h"
@@ -46,6 +42,10 @@
#include "BLI_math.h"
#include "BLI_rect.h"
+#include "BKE_context.h"
+#include "BKE_movieclip.h"
+#include "BKE_tracking.h"
+
#include "ED_screen.h"
#include "ED_clip.h"
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -37,11 +37,6 @@
#include "MEM_guardedalloc.h"
-#include "BKE_context.h"
-#include "BKE_movieclip.h"
-#include "BKE_tracking.h"
-#include "BKE_mask.h"
-
#include "IMB_colormanagement.h"
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
@@ -52,6 +47,11 @@
#include "BLI_rect.h"
#include "BLI_math_base.h"
+#include "BKE_context.h"
+#include "BKE_movieclip.h"
+#include "BKE_tracking.h"
+#include "BKE_mask.h"
+
#include "ED_screen.h"
#include "ED_clip.h"
#include "ED_mask.h"
Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -35,14 +35,14 @@
#include "MEM_guardedalloc.h"
+#include "BLI_utildefines.h"
+#include "BLI_math.h"
+#include "BLI_string.h"
+
#include "BKE_context.h"
#include "BKE_movieclip.h"
#include "BKE_tracking.h"
-#include "BLI_utildefines.h"
-#include "BLI_math.h"
-#include "BLI_string.h"
-
#include "ED_screen.h"
#include "ED_clip.h"
Modified: trunk/blender/source/blender/editors/space_file/file_panels.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_panels.c 2013-04-05 17:27:25 UTC (rev 55824)
+++ trunk/blender/source/blender/editors/space_file/file_panels.c 2013-04-05 17:56:54 UTC (rev 55825)
@@ -28,13 +28,12 @@
* \ingroup spfile
*/
+#include "BLI_blenlib.h"
+#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_screen.h"
-#include "BLI_blenlib.h"
-#include "BLI_utildefines.h"
-
#include "BLF_translation.h"
#include "DNA_screen_types.h"
Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list