[Bf-blender-cvs] [f8ce24f7962] blender2.7: Cleanup: sort forward declarations of enum & struct
Campbell Barton
noreply at git.blender.org
Mon Jan 28 12:10:16 CET 2019
Commit: f8ce24f79624b5bae8e6894d3ed4e619cef1cbb7
Author: Campbell Barton
Date: Mon Jan 28 22:08:29 2019 +1100
Branches: blender2.7
https://developer.blender.org/rBf8ce24f79624b5bae8e6894d3ed4e619cef1cbb7
Cleanup: sort forward declarations of enum & struct
Done using:
source/tools/utils_maintenance/c_sort_blocks.py
===================================================================
M intern/ghost/test/multitest/MultiTest.c
M source/blender/alembic/ABC_alembic.h
M source/blender/blenfont/BLF_api.h
M source/blender/blenfont/intern/blf_internal.h
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_action.h
M source/blender/blenkernel/BKE_anim.h
M source/blender/blenkernel/BKE_animsys.h
M source/blender/blenkernel/BKE_armature.h
M source/blender/blenkernel/BKE_blender_copybuffer.h
M source/blender/blenkernel/BKE_blender_undo.h
M source/blender/blenkernel/BKE_blendfile.h
M source/blender/blenkernel/BKE_bmfont.h
M source/blender/blenkernel/BKE_bvhutils.h
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_cdderivedmesh.h
M source/blender/blenkernel/BKE_cloth.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_colortools.h
M source/blender/blenkernel/BKE_constraint.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_crazyspace.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_customdata.h
M source/blender/blenkernel/BKE_data_transfer.h
M source/blender/blenkernel/BKE_deform.h
M source/blender/blenkernel/BKE_editmesh.h
M source/blender/blenkernel/BKE_editmesh_bvh.h
M source/blender/blenkernel/BKE_effect.h
M source/blender/blenkernel/BKE_fcurve.h
M source/blender/blenkernel/BKE_fluidsim.h
M source/blender/blenkernel/BKE_font.h
M source/blender/blenkernel/BKE_freestyle.h
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_icons.h
M source/blender/blenkernel/BKE_idprop.h
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_ipo.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_library.h
M source/blender/blenkernel/BKE_library_idmap.h
M source/blender/blenkernel/BKE_linestyle.h
M source/blender/blenkernel/BKE_main.h
M source/blender/blenkernel/BKE_mask.h
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/BKE_mball.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_mesh_mapping.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_multires.h
M source/blender/blenkernel/BKE_nla.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_object_deform.h
M source/blender/blenkernel/BKE_outliner_treehash.h
M source/blender/blenkernel/BKE_packedFile.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/BKE_property.h
M source/blender/blenkernel/BKE_rigidbody.h
M source/blender/blenkernel/BKE_sca.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_shrinkwrap.h
M source/blender/blenkernel/BKE_sound.h
M source/blender/blenkernel/BKE_subsurf.h
M source/blender/blenkernel/BKE_texture.h
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/depsgraph_private.h
M source/blender/blenkernel/intern/CCGSubSurf.h
M source/blender/blenkernel/intern/data_transfer_intern.h
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenlib/BLI_array_store.h
M source/blender/blenlib/BLI_callbacks.h
M source/blender/blenlib/BLI_graph.h
M source/blender/blenlib/BLI_linklist.h
M source/blender/blenlib/BLI_uvproject.h
M source/blender/blenloader/BLO_readfile.h
M source/blender/blenloader/BLO_writefile.h
M source/blender/blenloader/intern/readfile.h
M source/blender/bmesh/bmesh_class.h
M source/blender/bmesh/intern/bmesh_edgeloop.h
M source/blender/bmesh/intern/bmesh_operators_private.h
M source/blender/collada/collada.h
M source/blender/compositor/operations/COM_VectorBlurOperation.cpp
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_intern.h
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.h
M source/blender/editors/armature/BIF_generate.h
M source/blender/editors/armature/BIF_retarget.h
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/meshlaplacian.h
M source/blender/editors/armature/reeb.h
M source/blender/editors/curve/curve_intern.h
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_clip.h
M source/blender/editors/include/ED_curve.h
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/include/ED_image.h
M source/blender/editors/include/ED_keyframes_draw.h
M source/blender/editors/include/ED_keyframes_edit.h
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_lattice.h
M source/blender/editors/include/ED_markers.h
M source/blender/editors/include/ED_mask.h
M source/blender/editors/include/ED_mball.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_node.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_paint.h
M source/blender/editors/include/ED_particle.h
M source/blender/editors/include/ED_physics.h
M source/blender/editors/include/ED_render.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_sculpt.h
M source/blender/editors/include/ED_sequencer.h
M source/blender/editors/include/ED_text.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/include/ED_undo.h
M source/blender/editors/include/ED_util.h
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_interface.h
M source/blender/editors/include/UI_interface_icons.h
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/interface_intern.h
M source/blender/editors/mask/mask_intern.h
M source/blender/editors/mesh/mesh_intern.h
M source/blender/editors/object/object_intern.h
M source/blender/editors/render/render_intern.h
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/space_action/action_intern.h
M source/blender/editors/space_clip/clip_intern.h
M source/blender/editors/space_clip/tracking_ops_intern.h
M source/blender/editors/space_console/console_intern.h
M source/blender/editors/space_file/file_intern.h
M source/blender/editors/space_graph/graph_intern.h
M source/blender/editors/space_image/image_intern.h
M source/blender/editors/space_info/info_intern.h
M source/blender/editors/space_logic/logic_intern.h
M source/blender/editors/space_node/node_intern.h
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_text/text_intern.h
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/transform/transform.h
M source/blender/editors/uvedit/uvedit_intern.h
M source/blender/editors/uvedit/uvedit_parametrizer.c
M source/blender/freestyle/FRS_freestyle.h
M source/blender/gpu/GPU_buffers.h
M source/blender/gpu/GPU_compositing.h
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_codegen.h
M source/blender/ikplugin/BIK_api.h
M source/blender/ikplugin/intern/ikplugin_api.h
M source/blender/imbuf/IMB_colormanagement.h
M source/blender/imbuf/IMB_metadata.h
M source/blender/imbuf/intern/IMB_anim.h
M source/blender/imbuf/intern/IMB_colormanagement_intern.h
M source/blender/makesdna/DNA_ID.h
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_actuator_types.h
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_controller_types.h
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_fileglobal_types.h
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesdna/DNA_lamp_types.h
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_meta_types.h
M source/blender/makesdna/DNA_movieclip_types.h
M source/blender/makesdna/DNA_nla_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_fluidsim_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_sensor_types.h
M source/blender/makesdna/DNA_sequence_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_texture_types.h
M source/blender/makesdna/DNA_tracking_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/DNA_world_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/rna_internal_types.h
M source/blender/modifiers/intern/MOD_fluidsim_util.h
M source/blender/modifiers/intern/MOD_weightvg_util.h
M source/blender/nodes/NOD_socket.h
M source/blender/nodes/intern/node_exec.h
M source/blender/nodes/intern/node_util.h
M source/blender/physics/BPH_mass_spring.h
M source/blender/python/BPY_extern.h
M source/blender/python/bmesh/bmesh_py_types_meshdata.h
M source/blender/python/generic/idprop_py_api.h
M source/blender/render/extern/include/RE_bake.h
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/extern/include/RE_shader_ext.h
M source/blender/render/intern/include/envmap.h
M source/blender/render/intern/include/occlusion.h
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/include/render_types.h
M source/blender/render/intern/include/rendercore.h
M source/blender/render/intern/include/renderdatabase.h
M source/blender/render/intern/include/shadbuf.h
M source/blender/render/intern/include/shading.h
M source/blender/render/intern/include/sss.h
M source/blender/render/intern/include/strand.h
M source/blender/render/intern/include/texture.h
M source/blender/render/intern/include/zbuf.h
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/wm.h
M source/blender/windowmanager/wm_cursors.h
M source/blender/windowmanager/wm_draw.h
M source/blender/windowmanager/wm_event_system.h
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/gameengine/BlenderRoutines/BL_System.h
M source/gameengine/Converter/BL_ArmatureChannel.h
M source/gameengine/Converter/BL_ArmatureConstraint.h
M source/gameengine/Converter/BL_ArmatureObject.h
M source/gameengine/Converter/KX_BlenderSceneConverter.h
M source/gameengine/Ketsji/BL_Material.h
M source/gameengine/Ketsji/BL_Texture.h
M source/gameengine/Ketsji/KX_Light.h
M source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
M source/gameengine/Rasterizer/RAS_ICanvas.h
M source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
===================================================================
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 8cd31c3137e..dbb68a07895 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -61,8 +61,8 @@ char U[1024] = {0};
/***/
-typedef struct _MultiTestApp MultiTestApp;
typedef struct _LoggerWindow LoggerWindow;
+typedef struct _MultiTestApp MultiTestApp;
void loggerwindow_log(LoggerWindow *lw, char *line);
diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/alembic/ABC_alembic.h
index 70250310213..f32169406b6 100644
--- a/source/blender/alembic/ABC_alembic.h
+++ b/source/blender/alembic/ABC_alembic.h
@@ -27,12 +27,12 @@
extern "C" {
#endif
-struct bContext;
struct CacheReader;
struct DerivedMesh;
struct ListBase;
struct Object;
struct Scene;
+struct bContext;
typedef struct AbcArchiveHandle AbcArchiveHandle;
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 7a6d00299c9..d66598c985b 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -35,9 +35,9 @@
#include "BLI_compiler_attrs.h"
#include "BLI_sys_types.h"
-struct rctf;
struct ColorManagedDisplay;
struct ResultBLF;
+struct rctf;
int BLF_init(void);
void BLF_exit(void);
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 708466e8ebd..c2895fbad11 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -31,10 +31,10 @@
#ifndef __BLF_INTERNAL_H__
#define __BLF_INTERNAL_H__
-struct ResultBLF;
struct FontBLF;
struct GlyphBLF;
struct GlyphCacheBLF;
+struct ResultBLF;
struct rctf;
unsigned int blf_next_p2(unsigned int x);
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 35496ea3313..c345e02d124 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -80,24 +80,24 @@
#include "BKE_customdata.h"
#include "BKE_bvhutils.h"
+struct BMEditMesh;
struct CCGElem;
struct CCGKey;
-struct MVert;
+struct ColorBand;
+struct GPUDrawObject;
+struct GPUVertexAttribs;
+struct KeyBlock;
+struct MCol;
struct MEdge;
struct MFace;
+struct MLoopNorSpaceArray;
struct MTFace;
-struct Object;
-struct Scene;
+struct MVert;
struct Mesh;
-struct MLoopNorSpaceArray;
-struct BMEditMesh;
-struct KeyBlock;
struct ModifierData;
-struct MCol;
-struct ColorBand;
-struct GPUVertexAttribs;
-struct GPUDrawObject;
+struct Object;
struct PBVH;
+struct Scene;
/* number of sub-elements each mesh element has (for interpolation) */
#define SUB_ELEMS_VERT 0
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 917226888a2..490dfe30399 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -38,14 +38,14 @@
#include "DNA_listBase.h"
/* The following structures are defined in DNA_action_types.h, and DNA_anim_types.h */
+struct FCurve;
+struct Main;
+struct Object;
struct bAction;
struct bActionGroup;
-struct FCurve;
-struct bPose;
struct bItasc;
+struct bPose;
struct bPoseChannel;
-struct Main;
-struct Object;
/* Kernel prototypes */
#ifdef __cplusplus
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index 05717e3c8af..61306c85906 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -32,9 +32,6 @@
* \author nzc
* \since March 2001
*/
-struct bAnimVizSettings;
-struct bMotionPath;
-struct bPoseChannel;
struct EvaluationContext;
struct ListBase;
struct Main;
@@ -42,6 +39,9 @@ struct Object;
struct Path;
struct ReportList;
struct Scene;
+struct bAnimVizSettings;
+struct bMotionPath;
+struct bPoseChannel;
/* ---------------------------------------------------- */
/* Animation Visualization */
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h
index b66199d58aa..d5c64d1f8da 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -31,22 +31,22 @@
* \author Joshua Leung
*/
-struct ID;
-struct ListBase;
-struct Main;
struct AnimData;
struct FCurve;
-struct KeyingSet;
+struct ID;
struct KS_Path;
+struct KeyingSet;
+struct ListBase;
+struct Main;
struct PathResolvedRNA;
struct bContext;
+struct AnimMapper;
struct PointerRNA;
struct PropertyRNA;
struct ReportList;
struct bAction;
struct bActionGroup;
-struct AnimMapper;
/* ************************************* */
/* AnimData API */
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index efd665b070a..67792229012 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -35,14 +35,14 @@
struct Bone;
struct GHash;
+struct ListBase;
struct Main;
-struct bArmature;
-struct bPoseChannel;
-struct bConstraint;
-struct Scene;
struct Object;
struct PoseTree;
-struct ListBase;
+struct Scene;
+struct bArmature;
+struct bConstraint;
+struct bPoseChannel;
typedef struct PoseTarget {
struct PoseTarget *next, *prev;
@@ -152,10 +152,10 @@ void BKE_pchan_bbone_spline_setup(struct bPoseChannel *pchan, int rest, Mat4 res
(PBONE_VISIBLE(arm, bone) && !((bone)->flag & BONE_UNSELECTABLE))
/* Evaluation helpers */
+struct EvaluationContext;
struct bKinematicConstraint;
struct bPose;
struct bSplineIKConstraint;
-struct EvaluationContext;
struct bPoseChannel *BKE_armature_ik_solver_find_root(
struct bPoseChannel *pchan,
diff --git a/source/blender/blenkernel/BKE_blender_copybuffer.h b/source/blender/blenkernel/BKE_blender_copybuffer.h
index 02bd96217f6..3f8181f05c6 100644
--- a/source/blender/blenkernel/BKE_blender_copybuffer.h
+++ b/source/blender/blenkernel/BKE_blender_copybuffer.h
@@ -28,10 +28,10 @@
extern "C" {
#endif
-struct bContext;
-struct ReportList;
-struct Main;
struct ID;
+struct Main;
+struct ReportList;
+struct bContext;
/* copybuffer (wrapper for BKE_blendfile_write_partial) */
void BKE_copybuffer_begin(struct Main *bmain_src);
diff --git a/source/blender/blenkernel/BKE_blender_undo.h b/source/blender/blenkernel/BKE_blender_undo.h
index a96f8af1fdb..5d3fa2726a2 100644
--- a/source/blender/blenkernel/BKE_blender_undo.h
+++ b/source/blender/blenkernel/BKE_blender_undo.h
@@ -28,10 +28,10 @@
extern "C" {
#endif
-struct bContext;
-struct Scene;
struct Main;
struct MemFileUndoData;
+struct Scene;
+struct bContext;
#define BKE_UNDO_STR_MAX 64
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h
index 74fdde93d9a..d59a3c2cee2 100644
--- a/source/blender/blenkernel/BKE_blendfile.h
+++ b/source/blender/blenkernel/BKE_blendfile.h
@@ -28,13 +28,13 @@
extern "C" {
#endif
-struct bContext;
+struct BlendFileReadParams;
struct ID;
struct Main;
struct MemFile;
struct ReportList;
struct UserDef;
-struct BlendFileReadParams;
+struct bContext;
enum {
BKE_BLENDFILE_READ_FAIL = 0, /* no load */
diff --git a/source/blender/blenkernel/BKE_bmfont.h b/source/blender/blenkernel/BKE_bmfont.h
index 3be84c83892..97ecb1ffa5c 100644
--- a/source/blender/blenkernel/BKE_bmfont.h
+++ b/source/blender/blenkernel/BKE_bmfont.h
@@ -37,9 +37,9 @@
extern "C" {
#endif
-struct bmGlyph;
struct ImBuf;
struct bmFont;
+struct bmGlyph;
void printfGlyph(struct bmGlyph *glyph);
void calcAlpha(struct ImBuf *ibuf);
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index c6057442fec..d818ae81b27 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -38,10 +38,10 @@
* This header encapsulates necessary code to build a BVH
*/
-struct DerivedMesh;
struct BMEditMesh;
-struct MVert;
+struct DerivedMesh;
struct MFace;
+struct MVert;
typedef struct LinkNode BVHCache;
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 8eb8ef22b49..91d0b42bbcb 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -39,14 +39,14 @@ extern "C" {
#include "DNA_vec_types.h"
struct Camera;
+struct GPUFXSettings;
struct Main;
struct Object;
struct RegionView3D;
struct RenderData;
struct Scene;
-struct rctf;
struct View3D;
-struct GPUFXSettings;
+struct rctf;
/* Camera Datablock */
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 761b679983d..962cba6a638 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -37,10 +37,10 @@
#include "BKE_DerivedMesh.h"
-struct DerivedMesh;
struct BMEditMesh;
-struct Mesh;
+struct DerivedMesh;
struct MLoopNorSpaceArray;
+struct Mesh;
struct Object;
/* creates a new CDDerivedMesh */
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 6b76ec33c06..bd10a49059b 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -35,12 +35,12 @@
#include <float.h>
#include "BLI_math_inline.h"
-struct Object;
-struct Scene;
-struct MFace;
-struct DerivedMesh;
struct ClothModifierData;
struct CollisionModifierData;
+struct DerivedMesh;
+struct MFace;
+struct Object;
+struct Scene;
#define DO_INLINE MALWAYS_INLINE
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 98dc7d69c0d..02fe89c0d7e 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -47,9 +47,9 @@ struct CollisionModifierData;
struct Group;
struct MFace;
struct MVert;
+struct MVertTri;
struct Object;
struct Scene;
-struct MVertTri;
////////////////////////////////////////
// used for collisions in collision.c
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index 5332b3acd72..e44d7a283b0 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list