[Bf-blender-cvs] [c0f88ed8a86] master: Cleanup: sort forward declarations of enum & struct
Campbell Barton
noreply at git.blender.org
Mon Jan 28 11:15:45 CET 2019
Commit: c0f88ed8a860026e32ec6a06287fcf9394b4cf0a
Author: Campbell Barton
Date: Mon Jan 28 21:08:24 2019 +1100
Branches: master
https://developer.blender.org/rBc0f88ed8a860026e32ec6a06287fcf9394b4cf0a
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/alembic/intern/abc_exporter.h
M source/blender/alembic/intern/abc_util.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_brush.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_collection.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_displist.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_gpencil_modifier.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_lightprobe.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_iterators.h
M source/blender/blenkernel/BKE_mesh_mapping.h
M source/blender/blenkernel/BKE_mesh_remap.h
M source/blender/blenkernel/BKE_mesh_runtime.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_object_facemap.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_rigidbody.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_shader_fx.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/BKE_workspace.h
M source/blender/blenkernel/intern/CCGSubSurf.h
M source/blender/blenkernel/intern/data_transfer_intern.h
M source/blender/blenlib/BLI_array_store.h
M source/blender/blenlib/BLI_callbacks.h
M source/blender/blenlib/BLI_linklist.h
M source/blender/blenlib/BLI_uvproject.h
M source/blender/blenlib/intern/BLI_timer.c
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_mesh.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/DEG_depsgraph_physics.h
M source/blender/depsgraph/DEG_depsgraph_query.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/draw/DRW_engine.h
M source/blender/draw/engines/eevee/eevee_lightcache.h
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache_impl.h
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_hair_private.h
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/armature/meshlaplacian.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_gizmo_library.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_outliner.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/screen/screen_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_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/gpencil_modifiers/intern/MOD_gpencil_util.h
M source/blender/gpu/GPU_batch_presets.h
M source/blender/gpu/GPU_draw.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/GPU_texture.h
M source/blender/gpu/intern/gpu_codegen.h
M source/blender/ikplugin/BIK_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_brush_types.h
M source/blender/makesdna/DNA_camera_types.h
M source/blender/makesdna/DNA_collection_types.h
M source/blender/makesdna/DNA_constraint_types.h
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesdna/DNA_freestyle_types.h
M source/blender/makesdna/DNA_image_types.h
M source/blender/makesdna/DNA_lamp_types.h
M source/blender/makesdna/DNA_lightprobe_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_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/python/intern/bpy_gizmo_wrap.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_render_ext.h
M source/blender/render/extern/include/RE_shader_ext.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/texture.h
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_toolsystem.h
M source/blender/windowmanager/WM_types.h
M source/blender/windowmanager/gizmo/WM_gizmo_api.h
M source/blender/windowmanager/gizmo/WM_gizmo_types.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
M source/blender/windowmanager/gizmo/wm_gizmo_wmapi.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/blender/windowmanager/wm_window.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 4c06caeae15..bc607d86188 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 ListBase;
struct Mesh;
struct Object;
struct Scene;
+struct bContext;
typedef struct AbcArchiveHandle AbcArchiveHandle;
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index e5604884bad..9b3a4fb8dcd 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -34,12 +34,12 @@ class AbcObjectWriter;
class AbcTransformWriter;
class ArchiveWriter;
+struct Base;
struct Depsgraph;
struct Main;
struct Object;
struct Scene;
struct ViewLayer;
-struct Base;
struct ExportSettings {
ExportSettings();
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index fae73ec9d11..d39295f4f7a 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -46,9 +46,9 @@ using Alembic::Abc::chrono_t;
class AbcObjectReader;
struct ImportSettings;
+struct Base;
struct ID;
struct Object;
-struct Base;
std::string get_id_name(const ID * const id);
std::string get_id_name(const Object * const ob);
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index 75afa0e3018..e20023f30cd 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -38,9 +38,9 @@
/* enable this only if needed (unused circa 2016) */
#define BLF_BLUR_ENABLE 0
-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 624f3ae884c..826d6fcfeb4 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;
void blf_batch_draw_vao_clear(void);
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 7bb4142b237..2d30c9e95e4 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -80,19 +80,19 @@
#include "BKE_customdata.h"
#include "BKE_bvhutils.h"
+struct BMEditMesh;
struct CCGElem;
struct CCGKey;
-struct MVert;
+struct Depsgraph;
struct MEdge;
struct MFace;
-struct Object;
-struct Scene;
-struct Mesh;
struct MLoopNorSpaceArray;
-struct BMEditMesh;
+struct MVert;
+struct Mesh;
struct ModifierData;
-struct Depsgraph;
+struct Object;
struct PBVH;
+struct Scene;
/* number of sub-elements each mesh element has (for interpolation) */
// #define SUB_ELEMS_VERT 0 /* UNUSED */
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 4e5afde97e0..d4dd3fd69ce 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 0d8a50c5325..316a8bf2292 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 Depsgraph;
struct ListBase;
struct Main;
@@ -43,6 +40,9 @@ struct ParticleSystem;
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 0ed0339c5f8..3790230153a 100644
--- a/source/blender/blenkernel/BKE_animsys.h
+++ b/source/blender/blenkernel/BKE_animsys.h
@@ -40,6 +40,7 @@ struct KS_Path;
struct KeyingSet;
struct ListBase;
struct Main;
+struct NlaKeyframingContext;
struct PathResolvedRNA;
struct PointerRNA;
struct PropertyRNA;
@@ -48,7 +49,6 @@ struct Scene;
struct bAction;
struct bActionGroup;
struct bContext;
-struct NlaKeyframingContext;
/* ************************************* */
/* AnimData API */
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index e7129fc3e7b..f0dc49f7ed1 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -33,18 +33,18 @@
* \author nzc
*/
-struct bPose;
struct Bone;
struct Depsgraph;
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 bPose;
+struct bPoseChannel;
typedef struct PoseTarget {
struct PoseTarget *next, *prev;
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 e272fcaa3ec..43fe629dcac 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_brush.h b/source/blender/blenkernel/BKE_brush.h
index 91743bfa567..6d262698c9f 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -28,16 +28,16 @@
*/
enum eCurveMappingPreset;
-struct bContext;
struct Brush;
-struct Paint;
struct ImBuf;
struct ImagePool;
struct Main;
+struct Material;
+struct Paint;
struct Scene;
struct ToolSettings;
struct UnifiedPaintSettings;
-struct Material;
+struct bContext;
// enum eCurveMappingPreset;
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index 018f535a4cb..7817175deb4 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -38,11 +38,11 @@
* This header encapsulates necessary code to build a BVH
*/
-struct DerivedMesh;
struct BMEditMesh;
-struct Mesh;
-struct MVert;
+struct DerivedMesh;
struct MFace;
+struct MVert;
+struct Mesh;
typedef struct LinkNode BVHCache;
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index 6cdd232e97c..20515b143de 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -40,15 +40,15 @@ extern "C" {
struct Camera;
struct Depsgraph;
+struct GPUFXSettings;
struct Main;
struct Object;
struct RegionView3D;
struct RenderData;
struct Scene;
+struct View3D;
struct ViewLayer;
struct rctf;
-struct View3D;
-struct GPUFXSettings;
/* Camera Datablock */
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index f2c0b96aa80..63cbf4b89a6 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -38,10 +38,10 @@
#include "BKE_DerivedMesh.h"
#include "BKE_customdata.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 13cba949361..1d039f5c378 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -35,13 +35,13 @@
#include <float.h>
#include "BLI_math_inline.h"
-struct Object;
-struct Scene;
-struct Mesh;
-struct MFace;
struct ClothModifierData;
struct CollisionModifierData;
struct Depsgraph;
+struct MFace;
+struct Mesh;
+struct Object;
+struct Scene;
#define DO_INLINE MALWAYS_INLINE
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index ea824c63c40..64b1eceec9b 100644
--- a/sourc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list