Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_DerivedMesh.h20
-rw-r--r--source/blender/blenkernel/BKE_action.h8
-rw-r--r--source/blender/blenkernel/BKE_anim.h6
-rw-r--r--source/blender/blenkernel/BKE_animsys.h10
-rw-r--r--source/blender/blenkernel/BKE_armature.h12
-rw-r--r--source/blender/blenkernel/BKE_blender_copybuffer.h6
-rw-r--r--source/blender/blenkernel/BKE_blender_undo.h4
-rw-r--r--source/blender/blenkernel/BKE_blendfile.h4
-rw-r--r--source/blender/blenkernel/BKE_bmfont.h2
-rw-r--r--source/blender/blenkernel/BKE_bvhutils.h4
-rw-r--r--source/blender/blenkernel/BKE_camera.h4
-rw-r--r--source/blender/blenkernel/BKE_cdderivedmesh.h4
-rw-r--r--source/blender/blenkernel/BKE_cloth.h8
-rw-r--r--source/blender/blenkernel/BKE_collision.h2
-rw-r--r--source/blender/blenkernel/BKE_colortools.h4
-rw-r--r--source/blender/blenkernel/BKE_constraint.h4
-rw-r--r--source/blender/blenkernel/BKE_context.h28
-rw-r--r--source/blender/blenkernel/BKE_crazyspace.h4
-rw-r--r--source/blender/blenkernel/BKE_curve.h2
-rw-r--r--source/blender/blenkernel/BKE_customdata.h4
-rw-r--r--source/blender/blenkernel/BKE_data_transfer.h2
-rw-r--r--source/blender/blenkernel/BKE_deform.h4
-rw-r--r--source/blender/blenkernel/BKE_editmesh.h6
-rw-r--r--source/blender/blenkernel/BKE_editmesh_bvh.h6
-rw-r--r--source/blender/blenkernel/BKE_effect.h8
-rw-r--r--source/blender/blenkernel/BKE_fcurve.h12
-rw-r--r--source/blender/blenkernel/BKE_fluidsim.h4
-rw-r--r--source/blender/blenkernel/BKE_font.h6
-rw-r--r--source/blender/blenkernel/BKE_freestyle.h2
-rw-r--r--source/blender/blenkernel/BKE_gpencil.h10
-rw-r--r--source/blender/blenkernel/BKE_icons.h2
-rw-r--r--source/blender/blenkernel/BKE_idprop.h2
-rw-r--r--source/blender/blenkernel/BKE_image.h12
-rw-r--r--source/blender/blenkernel/BKE_ipo.h2
-rw-r--r--source/blender/blenkernel/BKE_key.h8
-rw-r--r--source/blender/blenkernel/BKE_lattice.h6
-rw-r--r--source/blender/blenkernel/BKE_library.h8
-rw-r--r--source/blender/blenkernel/BKE_library_idmap.h2
-rw-r--r--source/blender/blenkernel/BKE_linestyle.h2
-rw-r--r--source/blender/blenkernel/BKE_main.h4
-rw-r--r--source/blender/blenkernel/BKE_mask.h4
-rw-r--r--source/blender/blenkernel/BKE_material.h2
-rw-r--r--source/blender/blenkernel/BKE_mball.h2
-rw-r--r--source/blender/blenkernel/BKE_mesh.h32
-rw-r--r--source/blender/blenkernel/BKE_mesh_mapping.h6
-rw-r--r--source/blender/blenkernel/BKE_modifier.h14
-rw-r--r--source/blender/blenkernel/BKE_multires.h4
-rw-r--r--source/blender/blenkernel/BKE_nla.h2
-rw-r--r--source/blender/blenkernel/BKE_node.h32
-rw-r--r--source/blender/blenkernel/BKE_object.h16
-rw-r--r--source/blender/blenkernel/BKE_object_deform.h2
-rw-r--r--source/blender/blenkernel/BKE_outliner_treehash.h2
-rw-r--r--source/blender/blenkernel/BKE_packedFile.h2
-rw-r--r--source/blender/blenkernel/BKE_paint.h14
-rw-r--r--source/blender/blenkernel/BKE_particle.h26
-rw-r--r--source/blender/blenkernel/BKE_pbvh.h8
-rw-r--r--source/blender/blenkernel/BKE_pointcache.h2
-rw-r--r--source/blender/blenkernel/BKE_property.h2
-rw-r--r--source/blender/blenkernel/BKE_rigidbody.h4
-rw-r--r--source/blender/blenkernel/BKE_sca.h4
-rw-r--r--source/blender/blenkernel/BKE_scene.h4
-rw-r--r--source/blender/blenkernel/BKE_screen.h2
-rw-r--r--source/blender/blenkernel/BKE_sequencer.h10
-rw-r--r--source/blender/blenkernel/BKE_shrinkwrap.h8
-rw-r--r--source/blender/blenkernel/BKE_sound.h2
-rw-r--r--source/blender/blenkernel/BKE_subsurf.h14
-rw-r--r--source/blender/blenkernel/BKE_texture.h4
-rw-r--r--source/blender/blenkernel/BKE_tracking.h16
-rw-r--r--source/blender/blenkernel/depsgraph_private.h4
-rw-r--r--source/blender/blenkernel/intern/CCGSubSurf.h6
-rw-r--r--source/blender/blenkernel/intern/data_transfer_intern.h2
-rw-r--r--source/blender/blenkernel/intern/smoke.c2
72 files changed, 251 insertions, 251 deletions
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/BKE_colortools.h
@@ -34,12 +34,12 @@
struct ColorManagedColorspaceSettings;
struct ColorManagedDisplaySettings;
struct ColorManagedViewSettings;
-struct CurveMapping;
struct CurveMap;
struct CurveMapPoint;
-struct Scopes;
+struct CurveMapping;
struct Histogram;
struct ImBuf;
+struct Scopes;
struct rctf;
void curvemapping_set_defaults(struct CurveMapping *cumap, int tot, float minx, float miny, float maxx, float maxy);
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 293ac30f0f9..bcf23957f03 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -34,11 +34,11 @@
*/
struct ID;
-struct bConstraint;
-struct bConstraintTarget;
struct ListBase;
struct Object;
struct Scene;
+struct bConstraint;
+struct bConstraintTarget;
struct bPoseChannel;
/* ---------------------------------------------------------------------------- */
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 4db365b7307..663d7f2586e 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -38,36 +38,36 @@ extern "C" {
#endif
struct ARegion;
-struct bScreen;
struct CacheFile;
+struct EditBone;
+struct ID;
+struct Image;
struct ListBase;
struct Main;
struct Object;
struct PointerRNA;
+struct RegionView3D;
struct ReportList;
struct Scene;
struct ScrArea;
+struct SpaceClip;
+struct SpaceImage;
struct SpaceLink;
-struct View3D;
-struct RegionView3D;
+struct SpaceText;
struct StructRNA;
-struct ToolSettings;
-struct Image;
struct Text;
-struct EditBone;
-struct bPoseChannel;
-struct bGPdata;
-struct bGPDlayer;
+struct ToolSettings;
+struct View3D;
+struct bGPDbrush;
struct bGPDframe;
+struct bGPDlayer;
struct bGPDpalette;
struct bGPDpalettecolor;
-struct bGPDbrush;
+struct bGPdata;
+struct bPoseChannel;
+struct bScreen;
struct wmWindow;
struct wmWindowManager;
-struct SpaceText;
-struct SpaceImage;
-struct SpaceClip;
-struct ID;
/* Structs */
diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h
index ee6c5c57678..fd632e1245b 100644
--- a/source/blender/blenkernel/BKE_crazyspace.h
+++ b/source/blender/blenkernel/BKE_crazyspace.h
@@ -34,10 +34,10 @@
#ifdef __cplusplus
extern "C" {
#endif
-struct Scene;
-struct Object;
struct BMEditMesh;
struct Mesh;
+struct Object;
+struct Scene;
/* crazyspace.c */
float (*BKE_crazyspace_get_mapped_editverts(
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 5b7e5f9eebb..c9fba34d0cf 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -41,8 +41,8 @@ struct ListBase;
struct Main;
struct Nurb;
struct Object;
-struct Scene;
struct Path;
+struct Scene;
struct TextBox;
struct rctf;
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index e75997cd394..a1fb5545544 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -44,8 +44,8 @@ extern "C" {
#include "DNA_customdata_types.h"
struct BMesh;
-struct ID;
struct CustomData;
+struct ID;
typedef uint64_t CustomDataMask;
/*a data type large enough to hold 1 element from any customdata layer type*/
@@ -404,8 +404,8 @@ void CustomData_external_reload(struct CustomData *data,
/* Mesh-to-mesh transfer data. */
-struct MeshPairRemap;
struct CustomDataTransferLayerMap;
+struct MeshPairRemap;
typedef void (*cd_datatransfer_interp)(
const struct CustomDataTransferLayerMap *laymap, void *dest,
diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h
index 2ee9d8d2408..be1711967ae 100644
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@ -39,9 +39,9 @@ extern "C" {
#include "BKE_customdata.h"
struct Object;
+struct ReportList;
struct Scene;
struct SpaceTransform;
-struct ReportList;
/* Warning, those def are stored in files (TransferData modifier), *DO NOT* modify those values. */
enum {
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index a20c5a4240c..993485d47b3 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -35,13 +35,13 @@
* \brief support for deformation groups and hooks.
*/
-struct Object;
struct ListBase;
-struct bDeformGroup;
struct MDeformVert;
struct MEdge;
struct MLoop;
struct MPoly;
+struct Object;
+struct bDeformGroup;
struct bDeformGroup *BKE_defgroup_new(struct Object *ob, const char *name);
void defgroup_copy_list(struct ListBase *lb1, const struct ListBase *lb2);
diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h
index 2cae86d4c3b..940b6da0269 100644
--- a/source/blender/blenkernel/BKE_editmesh.h
+++ b/source/blender/blenkernel/BKE_editmesh.h
@@ -34,12 +34,12 @@
#include "BKE_customdata.h"
#include "bmesh.h"
-struct BMesh;
struct BMLoop;
-struct Mesh;
-struct Scene;
+struct BMesh;
struct DerivedMesh;
+struct Mesh;
struct MeshStatVis;
+struct Scene;
/**
* This structure is used for mesh edit-mode.
diff --git a/source/blender/blenkernel/BKE_editmesh_bvh.h b/source/blender/blenkernel/BKE_editmesh_bvh.h
index fe21eba429a..1d9f88d2ece 100644
--- a/source/blender/blenkernel/BKE_editmesh_bvh.h
+++ b/source/blender/blenkernel/BKE_editmesh_bvh.h
@@ -32,12 +32,12 @@
#ifndef __BKE_EDITMESH_BVH_H__
#define __BKE_EDITMESH_BVH_H__
+struct BMBVHTree;
struct BMEditMesh;
-struct BMesh;
struct BMFace;
-struct BMVert;
struct BMLoop;
-struct BMBVHTree;
+struct BMVert;
+struct BMesh;
struct BVHTree;
typedef struct BMBVHTree BMBVHTree;
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index f12c55e762c..06971a68187 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -37,13 +37,13 @@
#include "BLI_utildefines.h"
-struct Object;
-struct Scene;
-struct ListBase;
struct Group;
-struct ParticleSimulationData;
+struct ListBase;
+struct Object;
struct ParticleData;
struct ParticleKey;
+struct ParticleSimulationData;
+struct Scene;
struct EffectorWeights *BKE_effector_add_weights(struct Group *group);
diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h
index 99648f61584..6d9af30087d 100644
--- a/source/blender/blenkernel/BKE_fcurve.h
+++ b/source/blender/blenkernel/BKE_fcurve.h
@@ -36,21 +36,21 @@
extern "C" {
#endif
-struct FCurve;
-struct FModifier;
struct ChannelDriver;
-struct DriverVar;
struct DriverTarget;
+struct DriverVar;
struct FCM_EnvelopeData;
+struct FCurve;
+struct FModifier;
-struct bContext;
struct AnimData;
-struct bAction;
struct BezTriple;
-struct StructRNA;
struct PathResolvedRNA;
struct PointerRNA;
struct PropertyRNA;
+struct StructRNA;
+struct bAction;
+struct bContext;
#include "DNA_curve_types.h"
diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h
index af5b146906a..6d6965156de 100644
--- a/source/blender/blenkernel/BKE_fluidsim.h
+++ b/source/blender/blenkernel/BKE_fluidsim.h
@@ -32,10 +32,10 @@
* \ingroup bke
*/
-struct Object;
-struct Scene;
struct FluidsimSettings;
struct MVert;
+struct Object;
+struct Scene;
/* old interface */
diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index 3f6d67f5ded..8be4b175637 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -37,11 +37,11 @@ extern "C" {
#include <wchar.h>
-struct VFont;
-struct Object;
-struct Curve;
struct CharInfo;
+struct Curve;
struct Main;
+struct Object;
+struct VFont;
struct CharTrans {
float xof, yof;
diff --git a/source/blender/blenkernel/BKE_freestyle.h b/source/blender/blenkernel/BKE_freestyle.h
index ab527e9b393..a70112653e5 100644
--- a/source/blender/blenkernel/BKE_freestyle.h
+++ b/source/blender/blenkernel/BKE_freestyle.h
@@ -44,8 +44,8 @@ struct FreestyleModuleConfig;
struct Main;
/* RNA aliases */
-typedef struct FreestyleSettings FreestyleSettings;
typedef struct FreestyleModuleSettings FreestyleModuleSettings;
+typedef struct FreestyleSettings FreestyleSettings;
/* FreestyleConfig */
void BKE_freestyle_config_init(FreestyleConfig *config);
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 6758630252e..522207ba770 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -31,15 +31,15 @@
* \author Joshua Leung
*/
-struct ToolSettings;
struct ListBase;
-struct bGPdata;
-struct bGPDlayer;
+struct Main;
+struct ToolSettings;
struct bGPDframe;
-struct bGPDstroke;
+struct bGPDlayer;
struct bGPDpalette;
struct bGPDpalettecolor;
-struct Main;
+struct bGPDstroke;
+struct bGPdata;
/* ------------ Grease-Pencil API ------------------ */
diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index 686dba21283..42809ed0a97 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -46,8 +46,8 @@ struct Icon {
typedef struct Icon Icon;
-struct PreviewImage;
struct ID;
+struct PreviewImage;
enum eIconSizes;
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index 48a00462dd1..3e8b63b3921 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -32,8 +32,8 @@
#include "BLI_compiler_attrs.h"
-struct IDProperty;
struct ID;
+struct IDProperty;
typedef union IDPropertyTemplate {
int i;
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index e2c88798bea..9330a26a60d 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -37,18 +37,18 @@
extern "C" {
#endif
-struct Image;
struct ImBuf;
-struct ImbFormatOptions;
-struct anim;
-struct Scene;
-struct Object;
+struct Image;
struct ImageFormatData;
struct ImagePool;
+struct ImbFormatOptions;
struct Main;
-struct ReportList;
+struct Object;
struct RenderResult;
+struct ReportList;
+struct Scene;
struct StampData;
+struct anim;
#define IMA_MAX_SPACE 64
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 2370908332d..65228835d1d 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/source/blender/blenkernel/BKE_ipo.h
@@ -38,8 +38,8 @@
extern "C" {
#endif
-struct Main;
struct Ipo;
+struct Main;
void do_versions_ipos_to_animato(struct Main *main);
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 2f953e57d71..4f42c70a38e 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -32,15 +32,15 @@
* \since March 2001
* \author nzc
*/
+struct Curve;
+struct ID;
struct Key;
struct KeyBlock;
-struct ID;
-struct ListBase;
-struct Curve;
-struct Object;
struct Lattice;
+struct ListBase;
struct Main;
struct Mesh;
+struct Object;
struct WeightsArrayCache;
/* Kernel prototypes */
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index f7d006785d2..f72d67125e0 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -36,13 +36,13 @@
#include "BLI_compiler_attrs.h"
+struct BPoint;
+struct DerivedMesh;
struct Lattice;
+struct MDeformVert;
struct Main;
struct Object;
struct Scene;
-struct DerivedMesh;
-struct BPoint;
-struct MDeformVert;
void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb);
void BKE_lattice_init(struct Lattice *lt);
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h
index 2ab9ac3ee58..1852fcced1a 100644
--- a/source/blender/blenkernel/BKE_library.h
+++ b/source/blender/blenkernel/BKE_library.h
@@ -40,15 +40,15 @@ extern "C" {
struct BlendThumbnail;
struct GHash;
-struct ListBase;
struct ID;
struct ImBuf;
-struct Main;
struct Library;
-struct wmWindowManager;
-struct bContext;
+struct ListBase;
+struct Main;
struct PointerRNA;
struct PropertyRNA;
+struct bContext;
+struct wmWindowManager;
size_t BKE_libblock_get_alloc_info(short type, const char **name);
void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
diff --git a/source/blender/blenkernel/BKE_library_idmap.h b/source/blender/blenkernel/BKE_library_idmap.h
index 971586ea8b7..57b7d444c3c 100644
--- a/source/blender/blenkernel/BKE_library_idmap.h
+++ b/source/blender/blenkernel/BKE_library_idmap.h
@@ -27,8 +27,8 @@
#include "BLI_compiler_attrs.h"
struct ID;
-struct Main;
struct IDNameLib_Map;
+struct Main;
struct IDNameLib_Map *BKE_main_idmap_create(
struct Main *bmain)
diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h
index 3ba4fbe0338..2b7b3c0584d 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -44,9 +44,9 @@ extern "C" {
#define LS_MODIFIER_TYPE_THICKNESS 3
#define LS_MODIFIER_TYPE_GEOMETRY 4
+struct ColorBand;
struct Main;
struct Object;
-struct ColorBand;
struct bContext;
void BKE_linestyle_init(struct FreestyleLineStyle *linestyle);
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h
index e224155726f..2871875c87c 100644
--- a/source/blender/blenkernel/BKE_main.h
+++ b/source/blender/blenkernel/BKE_main.h
@@ -48,11 +48,11 @@
extern "C" {
#endif
+struct BLI_mempool;
struct EvaluationContext;
+struct GHash;
struct Library;
struct MainLock;
-struct GHash;
-struct BLI_mempool;
/* Blender thumbnail, as written on file (width, height, and data as char RGBA). */
/* We pack pixel data after that struct. */
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h
index 73d8394f2a0..b0a465e721e 100644
--- a/source/blender/blenkernel/BKE_mask.h
+++ b/source/blender/blenkernel/BKE_mask.h
@@ -33,14 +33,14 @@
*/
struct EvaluationContext;
-struct ImageUser;
struct Image;
+struct ImageUser;
struct ListBase;
struct Main;
struct Mask;
-struct MaskParent;
struct MaskLayer;
struct MaskLayerShape;
+struct MaskParent;
struct MaskSpline;
struct MaskSplinePoint;
struct MaskSplinePointUW;
diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.h
index b5d2323c59a..0211caaf3ee 100644
--- a/source/blender/blenkernel/BKE_material.h
+++ b/source/blender/blenkernel/BKE_material.h
@@ -36,9 +36,9 @@
extern "C" {
#endif
+struct ID;
struct Main;
struct Material;
-struct ID;
struct Object;
struct Scene;
diff --git a/source/blender/blenkernel/BKE_mball.h b/source/blender/blenkernel/BKE_mball.h
index 87bc7b2dfc5..1c48062b488 100644
--- a/source/blender/blenkernel/BKE_mball.h
+++ b/source/blender/blenkernel/BKE_mball.h
@@ -35,9 +35,9 @@
struct EvaluationContext;
struct Main;
struct MetaBall;
+struct MetaElem;
struct Object;
struct Scene;
-struct MetaElem;
void BKE_mball_free(struct MetaBall *mb);
void BKE_mball_init(struct MetaBall *mb);
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 6d2a431f667..2fb0da672eb 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -31,31 +31,31 @@
* \ingroup bke
*/
-struct ID;
+struct BLI_Stack;
+struct BMesh;
struct BMeshCreateParams;
struct BoundBox;
+struct CustomData;
+struct DerivedMesh;
struct EdgeHash;
-struct ListBase;
+struct ID;
struct LinkNode;
-struct BLI_Stack;
-struct MemArena;
-struct BMesh;
+struct ListBase;
+struct MDeformVert;
+struct MDisps;
+struct MEdge;
+struct MFace;
+struct MLoop;
struct MLoopTri;
-struct Main;
-struct Mesh;
+struct MLoopUV;
struct MPoly;
-struct MLoop;
-struct MFace;
-struct MEdge;
struct MVert;
-struct MDeformVert;
-struct MDisps;
+struct Main;
+struct MemArena;
+struct Mesh;
struct Object;
-struct CustomData;
-struct DerivedMesh;
-struct Scene;
-struct MLoopUV;
struct ReportList;
+struct Scene;
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index 1005a50a214..e356b36f7c1 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -31,12 +31,12 @@
* \ingroup bke
*/
-struct MVert;
struct MEdge;
-struct MPoly;
struct MLoop;
-struct MLoopUV;
struct MLoopTri;
+struct MLoopUV;
+struct MPoly;
+struct MVert;
/* map from uv vertex to face (for select linked, stitch, uv suburf) */
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 2d39ac4d102..f4bcebebef7 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -32,18 +32,18 @@
#include "BLI_compiler_attrs.h"
#include "BKE_customdata.h"
-struct ID;
-struct DerivedMesh;
+struct BMEditMesh;
struct DagForest;
struct DagNode;
-struct Object;
-struct Scene;
+struct DepsNodeHandle;
+struct DerivedMesh;
+struct ID;
struct ListBase;
-struct bArmature;
struct Main;
struct ModifierData;
-struct BMEditMesh;
-struct DepsNodeHandle;
+struct Object;
+struct Scene;
+struct bArmature;
typedef enum {
/* Should not be used, only for None modifier type */
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 3b58f327b63..86c6740c135 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -43,9 +43,9 @@ struct Object;
struct Scene;
struct MLoop;
-struct MVert;
-struct MPoly;
struct MLoopTri;
+struct MPoly;
+struct MVert;
/* Delete mesh mdisps and grid paint masks */
void multires_customdata_delete(struct Mesh *me);
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 37929bae042..ee350ef5a7c 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -37,9 +37,9 @@ struct AnimData;
struct Main;
struct NlaStrip;
struct NlaTrack;
-struct bAction;
struct Scene;
struct Speaker;
+struct bAction;
struct PointerRNA;
struct PropertyRNA;
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 3d78b95001d..6804b882a19 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -51,34 +51,34 @@
/* not very important, but the stack solver likes to know a maximum */
#define MAX_SOCKET 512
-struct bContext;
-struct bNode;
-struct bNodeLink;
-struct bNodeSocket;
-struct bNodeStack;
-struct bNodeTree;
-struct bNodeTreeType;
-struct bNodeTreeExec;
-struct bNodeExecContext;
-struct bNodeExecData;
+struct ARegion;
+struct ColorManagedDisplaySettings;
+struct ColorManagedViewSettings;
struct GPUMaterial;
struct GPUNodeStack;
struct ID;
struct ImBuf;
struct ImageFormatData;
struct ListBase;
-struct Main;
-struct uiLayout;
struct MTex;
+struct Main;
struct PointerRNA;
struct RenderData;
struct Scene;
-struct Tex;
struct SpaceNode;
-struct ARegion;
-struct ColorManagedViewSettings;
-struct ColorManagedDisplaySettings;
+struct Tex;
+struct bContext;
+struct bNode;
+struct bNodeExecContext;
+struct bNodeExecData;
struct bNodeInstanceHash;
+struct bNodeLink;
+struct bNodeSocket;
+struct bNodeStack;
+struct bNodeTree;
+struct bNodeTreeExec;
+struct bNodeTreeType;
+struct uiLayout;
/* -------------------------------------------------------------------- */
/** \name Node Type Definitions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 677d6b3fba2..b573f8e5807 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -36,18 +36,18 @@ extern "C" {
#include "BLI_compiler_attrs.h"
struct Base;
-struct EvaluationContext;
-struct Scene;
-struct Object;
struct BoundBox;
-struct View3D;
-struct SoftBody;
struct BulletSoftBody;
-struct MovieClip;
-struct Main;
-struct RigidBodyWorld;
+struct EvaluationContext;
struct HookModifierData;
+struct Main;
struct ModifierData;
+struct MovieClip;
+struct Object;
+struct RigidBodyWorld;
+struct Scene;
+struct SoftBody;
+struct View3D;
void BKE_object_workob_clear(struct Object *workob);
void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h
index ab54330cf53..cc3c72c0b7c 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -33,9 +33,9 @@
extern "C" {
#endif
-struct Object;
struct ID;
struct MDeformVert;
+struct Object;
struct bDeformGroup;
/* General vgroup operations */
diff --git a/source/blender/blenkernel/BKE_outliner_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.h
index 454edb40c4e..b68fb90efb2 100644
--- a/source/blender/blenkernel/BKE_outliner_treehash.h
+++ b/source/blender/blenkernel/BKE_outliner_treehash.h
@@ -26,8 +26,8 @@
* \ingroup bke
*/
-struct ID;
struct BLI_mempool;
+struct ID;
struct TreeStoreElem;
/* create and fill hashtable with treestore elements */
diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h
index 1056c5d2119..bdddd940fe0 100644
--- a/source/blender/blenkernel/BKE_packedFile.h
+++ b/source/blender/blenkernel/BKE_packedFile.h
@@ -36,12 +36,12 @@
#define RET_ERROR 1
struct ID;
-struct bSound;
struct Image;
struct Main;
struct PackedFile;
struct ReportList;
struct VFont;
+struct bSound;
/* pack */
struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index a8a5aa5274d..220b1cf8ba4 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -32,31 +32,31 @@
* \ingroup bke
*/
-struct bContext;
-struct BMesh;
struct BMFace;
+struct BMesh;
struct Brush;
struct CurveMapping;
-struct MeshElemMap;
struct GridPaintMask;
-struct Main;
+struct ImagePool;
+struct MFace;
struct MLoop;
struct MLoopTri;
-struct MFace;
struct MVert;
+struct Main;
+struct MeshElemMap;
struct Object;
+struct PBVH;
struct Paint;
struct PaintCurve;
struct Palette;
struct PaletteColor;
-struct PBVH;
struct ReportList;
struct Scene;
struct Sculpt;
struct StrokeCache;
struct Tex;
-struct ImagePool;
struct UnifiedPaintSettings;
+struct bContext;
enum eOverlayFlags;
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 54c927aaa99..896db8785bb 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -41,27 +41,27 @@
#include "BKE_customdata.h"
-struct ParticleSystemModifierData;
-struct ParticleSystem;
struct ParticleKey;
struct ParticleSettings;
+struct ParticleSystem;
+struct ParticleSystemModifierData;
-struct Main;
-struct Object;
-struct Scene;
+struct BVHTreeRay;
+struct BVHTreeRayHit;
struct DerivedMesh;
-struct ModifierData;
-struct MTFace;
+struct EdgeHash;
+struct KDTree;
+struct LatticeDeformData;
+struct LinkNode;
struct MCol;
struct MFace;
+struct MTFace;
struct MVert;
-struct LatticeDeformData;
-struct LinkNode;
-struct KDTree;
+struct Main;
+struct ModifierData;
+struct Object;
struct RNG;
-struct BVHTreeRay;
-struct BVHTreeRayHit;
-struct EdgeHash;
+struct Scene;
#define PARTICLE_COLLISION_MAX_COLLISIONS 10
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 1fede116193..98dafe42e5d 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -30,19 +30,19 @@
#include "BLI_ghash.h"
#include "BLI_utildefines.h"
+struct BMLog;
+struct BMesh;
+struct CCGDerivedMesh;
struct CCGElem;
struct CCGKey;
-struct CCGDerivedMesh;
struct CustomData;
struct DMFlagMat;
-struct MPoly;
struct MLoop;
struct MLoopTri;
+struct MPoly;
struct MVert;
struct PBVH;
struct PBVHNode;
-struct BMesh;
-struct BMLog;
typedef struct PBVH PBVH;
typedef struct PBVHNode PBVHNode;
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index e905a5efae4..a3125bee472 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -89,10 +89,10 @@ struct Object;
struct ParticleKey;
struct ParticleSystem;
struct PointCache;
+struct RigidBodyWorld;
struct Scene;
struct SmokeModifierData;
struct SoftBody;
-struct RigidBodyWorld;
struct OpenVDBReader;
struct OpenVDBWriter;
diff --git a/source/blender/blenkernel/BKE_property.h b/source/blender/blenkernel/BKE_property.h
index d917a6b55e6..c49316c75ab 100644
--- a/source/blender/blenkernel/BKE_property.h
+++ b/source/blender/blenkernel/BKE_property.h
@@ -31,9 +31,9 @@
* \ingroup bke
*/
-struct bProperty;
struct ListBase;
struct Object;
+struct bProperty;
void BKE_bproperty_free(struct bProperty *prop);
void BKE_bproperty_free_list(struct ListBase *lb);
diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h
index 470aae40df9..2d91754ff44 100644
--- a/source/blender/blenkernel/BKE_rigidbody.h
+++ b/source/blender/blenkernel/BKE_rigidbody.h
@@ -34,11 +34,11 @@
#ifndef __BKE_RIGIDBODY_H__
#define __BKE_RIGIDBODY_H__
-struct RigidBodyWorld;
struct RigidBodyOb;
+struct RigidBodyWorld;
-struct Scene;
struct Object;
+struct Scene;
/* -------------- */
/* Memory Management */
diff --git a/source/blender/blenkernel/BKE_sca.h b/source/blender/blenkernel/BKE_sca.h
index 653fc1afa64..e02458e6fb3 100644
--- a/source/blender/blenkernel/BKE_sca.h
+++ b/source/blender/blenkernel/BKE_sca.h
@@ -33,9 +33,9 @@
struct Main;
struct Object;
-struct bSensor;
-struct bController;
struct bActuator;
+struct bController;
+struct bSensor;
void link_logicbricks(void **poin, void ***ppoin, short *tot, short size);
void unlink_logicbricks(void **poin, void ***ppoin, short *tot);
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index e85867fcbe7..72b0ec862ec 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -41,12 +41,12 @@ struct AviCodecData;
struct Base;
struct EvaluationContext;
struct Main;
+struct Main;
struct Object;
struct RenderData;
-struct SceneRenderLayer;
struct Scene;
+struct SceneRenderLayer;
struct UnitSettings;
-struct Main;
#define SCE_COPY_NEW 0
#define SCE_COPY_EMPTY 1
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index b33b9e455f1..d7ba319e30c 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -34,6 +34,7 @@
*/
struct ARegion;
+struct GPUFXSettings;
struct Header;
struct ID;
struct ListBase;
@@ -52,7 +53,6 @@ struct wmKeyConfig;
struct wmNotifier;
struct wmWindow;
struct wmWindowManager;
-struct GPUFXSettings;
#include "BLI_compiler_attrs.h"
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 81f9bbebe7d..ef1c7957375 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -30,13 +30,11 @@
* \ingroup bke
*/
-struct bContext;
-struct EvaluationContext;
-struct StripColorBalance;
struct Editing;
-struct GSet;
-struct GPUOffScreen;
+struct EvaluationContext;
struct GPUFX;
+struct GPUOffScreen;
+struct GSet;
struct ImBuf;
struct Main;
struct Mask;
@@ -44,8 +42,10 @@ struct Scene;
struct Sequence;
struct SequenceModifierData;
struct Stereo3dFormat;
+struct StripColorBalance;
struct StripElem;
struct TextVars;
+struct bContext;
struct bSound;
struct SeqIndexBuildContext;
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 2dd42a9da1f..0e7fd39d473 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -46,13 +46,13 @@
* (So that you don't have to pass an enormous amount of arguments to functions)
*/
-struct Object;
+struct BVHTree;
struct DerivedMesh;
-struct MVert;
struct MDeformVert;
-struct ShrinkwrapModifierData;
struct MDeformVert;
-struct BVHTree;
+struct MVert;
+struct Object;
+struct ShrinkwrapModifierData;
struct SpaceTransform;
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index 6f8274fabc8..ae55a156e3e 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -39,9 +39,9 @@
# include AUD_DEVICE_H
#endif
-struct bSound;
struct Main;
struct Sequence;
+struct bSound;
typedef struct SoundWaveform {
int length;
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index f6b5140c9d9..2312f69a9dd 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -37,21 +37,21 @@
/* Thread sync primitives used directly. */
#include "BLI_threads.h"
+struct CCGEdge;
struct CCGElem;
+struct CCGFace;
+struct CCGVert;
struct DMFlagMat;
struct DMGridAdjacency;
struct DerivedMesh;
-struct MeshElemMap;
-struct Mesh;
+struct EdgeHash;
struct MPoly;
+struct Mesh;
+struct MeshElemMap;
struct Object;
struct PBVH;
-struct SubsurfModifierData;
-struct CCGEdge;
-struct CCGFace;
-struct CCGVert;
-struct EdgeHash;
struct PBVH;
+struct SubsurfModifierData;
/**************************** External *****************************/
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index 7ffa22ac49b..48dcbc160f6 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -37,16 +37,15 @@
extern "C" {
#endif
-struct bNode;
struct Brush;
struct ColorBand;
struct EnvMap;
struct FreestyleLineStyle;
struct ImagePool;
struct Lamp;
+struct MTex;
struct Main;
struct Material;
-struct MTex;
struct OceanTex;
struct ParticleSettings;
struct PointDensity;
@@ -55,6 +54,7 @@ struct TexMapping;
struct TexResult;
struct VoxelData;
struct World;
+struct bNode;
/* in ColorBand struct */
#define MAXCOLORBAND 32
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index 13302caa09d..b3d86a5993e 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -32,21 +32,21 @@
* \author Sergey Sharybin
*/
-struct bGPDlayer;
+struct Camera;
struct ImBuf;
struct ListBase;
+struct MovieClipUser;
+struct MovieDistortion;
struct MovieReconstructContext;
-struct MovieTrackingTrack;
-struct MovieTrackingMarker;
-struct MovieTrackingPlaneTrack;
-struct MovieTrackingPlaneMarker;
struct MovieTracking;
+struct MovieTrackingMarker;
struct MovieTrackingObject;
-struct MovieClipUser;
-struct MovieDistortion;
-struct Camera;
+struct MovieTrackingPlaneMarker;
+struct MovieTrackingPlaneTrack;
+struct MovieTrackingTrack;
struct Object;
struct Scene;
+struct bGPDlayer;
struct rcti;
/* **** Common functions **** */
diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h
index 72f4e2524a4..7092f237f72 100644
--- a/source/blender/blenkernel/depsgraph_private.h
+++ b/source/blender/blenkernel/depsgraph_private.h
@@ -34,10 +34,10 @@
#include "DNA_constraint_types.h"
#include "BKE_constraint.h"
-struct Scene;
-struct Group;
struct EffectorWeights;
+struct Group;
struct ModifierData;
+struct Scene;
/* **** DAG relation types *** */
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h
index 8cdbd2a7a98..8accec4c7ef 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.h
+++ b/source/blender/blenkernel/intern/CCGSubSurf.h
@@ -30,10 +30,10 @@ typedef void* CCGVertHDL;
typedef void* CCGEdgeHDL;
typedef void* CCGFaceHDL;
-typedef struct CCGSubSurf CCGSubSurf;
-typedef struct CCGVert CCGVert;
typedef struct CCGEdge CCGEdge;
typedef struct CCGFace CCGFace;
+typedef struct CCGSubSurf CCGSubSurf;
+typedef struct CCGVert CCGVert;
typedef struct CCGMeshIFC {
int vertUserSize, edgeUserSize, faceUserSize;
@@ -176,9 +176,9 @@ int ccgSubSurf_getNumFinalFaces (const CCGSubSurf *ss);
/***/
-typedef struct _EHashIterator CCGVertIterator;
typedef struct _EHashIterator CCGEdgeIterator;
typedef struct _EHashIterator CCGFaceIterator;
+typedef struct _EHashIterator CCGVertIterator;
void ccgSubSurf_initVertIterator(CCGSubSurf *ss, CCGVertIterator *viter);
void ccgSubSurf_initEdgeIterator(CCGSubSurf *ss, CCGEdgeIterator *eiter);
diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h
index 1a543a1deb5..ee1d63a1d90 100644
--- a/source/blender/blenkernel/intern/data_transfer_intern.h
+++ b/source/blender/blenkernel/intern/data_transfer_intern.h
@@ -33,8 +33,8 @@
#include "BKE_customdata.h" /* For cd_datatransfer_interp */
-struct CustomDataTransferLayerMap;
struct CustomData;
+struct CustomDataTransferLayerMap;
struct ListBase;
float data_transfer_interp_float_do(
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 06474115cdf..ef4617069ea 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -103,9 +103,9 @@
static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;
+struct DerivedMesh;
struct Object;
struct Scene;
-struct DerivedMesh;
struct SmokeModifierData;
// timestep default value for nice appearance 0.1f