Cleanup: sort struct blocks

2020-12-16 16:26:23 +11:00 · 2020-12-16 16:26:23 +11:00 · a869a61c88
parent b347c4e9ca
commit a869a61c88
31 changed files with 52 additions and 52 deletions
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@ -30,10 +30,10 @@
 extern "C" {
 #endif

-struct BlendWriter;
 struct BlendDataReader;
-struct BlendLibReader;
 struct BlendExpander;
+struct BlendLibReader;
+struct BlendWriter;
 struct bArmature;

 /* The following structures are defined in DNA_action_types.h, and DNA_anim_types.h */
--- a/source/blender/blenkernel/BKE_anim_visualization.h
+++ b/source/blender/blenkernel/BKE_anim_visualization.h
@ -26,14 +26,14 @@
 extern "C" {
 #endif

+struct BlendDataReader;
+struct BlendWriter;
 struct Object;
 struct ReportList;
 struct Scene;
 struct bAnimVizSettings;
 struct bMotionPath;
 struct bPoseChannel;
-struct BlendWriter;
-struct BlendDataReader;

 /* ---------------------------------------------------- */
 /* Animation Visualization */
--- a/source/blender/blenkernel/BKE_asset.h
+++ b/source/blender/blenkernel/BKE_asset.h
@ -27,8 +27,8 @@
 extern "C" {
 #endif

-struct BlendWriter;
 struct BlendDataReader;
+struct BlendWriter;
 struct ID;
 struct PreviewImage;

--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@ -26,9 +26,9 @@
 extern "C" {
 #endif

+struct BVHTree;
 struct Collection;
 struct CollisionModifierData;
-struct BVHTree;
 struct Depsgraph;
 struct MVert;
 struct MVertTri;
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@ -23,6 +23,10 @@
 * \ingroup bke
 */

+struct BlendDataReader;
+struct BlendExpander;
+struct BlendLibReader;
+struct BlendWriter;
 struct Depsgraph;
 struct ID;
 struct ListBase;
@ -31,10 +35,6 @@ struct Scene;
 struct bConstraint;
 struct bConstraintTarget;
 struct bPoseChannel;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;
-struct BlendExpander;

 /* ---------------------------------------------------------------------------- */
 #ifdef __cplusplus
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@ -29,9 +29,9 @@
 extern "C" {
 #endif

-struct Object;
-struct Material;
 struct Main;
+struct Material;
+struct Object;

 uint32_t BKE_cryptomatte_hash(const char *name, int name_len);
 uint32_t BKE_cryptomatte_object_hash(const struct Object *object);
--- a/source/blender/blenkernel/BKE_geometry_set.h
+++ b/source/blender/blenkernel/BKE_geometry_set.h
@ -24,9 +24,9 @@
 extern "C" {
 #endif

-struct Object;
-struct GeometrySet;
 struct Collection;
+struct GeometrySet;
+struct Object;

 void BKE_geometry_set_free(struct GeometrySet *geometry_set);

--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@ -32,10 +32,10 @@
 #include "BKE_attribute_access.hh"
 #include "BKE_geometry_set.h"

-struct Mesh;
-struct PointCloud;
-struct Object;
 struct Collection;
+struct Mesh;
+struct Object;
+struct PointCloud;

 /* Each geometry component has a specific type. The type determines what kind of data the component
 * stores. Functions modifying a geometry will usually just modify a subset of the component types.
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@ -42,11 +42,11 @@ struct SpaceImage;
 struct ToolSettings;
 struct ViewLayer;
 struct bDeformGroup;
+struct bGPDcurve;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPDlayer_Mask;
 struct bGPDstroke;
-struct bGPDcurve;
 struct bGPdata;

 #define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
--- a/source/blender/blenkernel/BKE_gpencil_curve.h
+++ b/source/blender/blenkernel/BKE_gpencil_curve.h
@ -30,10 +30,10 @@ extern "C" {
 struct Main;
 struct Object;
 struct Scene;
-struct bGPdata;
+struct bGPDcurve;
 struct bGPDlayer;
 struct bGPDstroke;
-struct bGPDcurve;
+struct bGPdata;

 void BKE_gpencil_convert_curve(struct Main *bmain,
                               struct Scene *scene,
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@ -32,11 +32,11 @@ struct Depsgraph;
 struct Main;
 struct Object;
 struct Scene;
+struct bGPDcurve;
 struct bGPDframe;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
-struct bGPDcurve;

 /* Object boundbox. */
 bool BKE_gpencil_data_minmax(const struct bGPdata *gpd, float r_min[3], float r_max[3]);
--- a/source/blender/blenkernel/BKE_gpencil_modifier.h
+++ b/source/blender/blenkernel/BKE_gpencil_modifier.h
@ -27,6 +27,9 @@ extern "C" {
 #endif

 struct ARegionType;
+struct BlendDataReader;
+struct BlendLibReader;
+struct BlendWriter;
 struct Depsgraph;
 struct GpencilModifierData;
 struct ID;
@ -35,9 +38,6 @@ struct Main;
 struct ModifierUpdateDepsgraphContext;
 struct Object;
 struct Scene;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;
 /* NOTE: bakeModifier() called from UI:
 * needs to create new data-blocks, hence the need for this. */
 struct bGPDframe;
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@ -35,6 +35,7 @@ struct BlendWriter;
 struct CustomData_MeshMasks;
 struct DepsNodeHandle;
 struct Depsgraph;
+struct GeometrySet;
 struct ID;
 struct ListBase;
 struct Main;
@ -43,7 +44,6 @@ struct ModifierData;
 struct Object;
 struct Scene;
 struct bArmature;
-struct GeometrySet;

 typedef enum {
  /* Should not be used, only for None modifier type */
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@ -34,6 +34,9 @@ extern "C" {

 struct BMFace;
 struct BMesh;
+struct BlendDataReader;
+struct BlendLibReader;
+struct BlendWriter;
 struct Brush;
 struct CurveMapping;
 struct Depsgraph;
@ -66,9 +69,6 @@ struct ViewLayer;
 struct bContext;
 struct bToolRef;
 struct tPaletteColorHSV;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;

 extern const char PAINT_CURSOR_SCULPT[3];
 extern const char PAINT_CURSOR_VERTEX_PAINT[3];
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@ -42,9 +42,9 @@ struct ParticleSystemModifierData;

 struct BVHTreeRay;
 struct BVHTreeRayHit;
-struct BlendWriter;
 struct BlendDataReader;
 struct BlendLibReader;
+struct BlendWriter;
 struct CustomData_MeshMasks;
 struct Depsgraph;
 struct EdgeHash;
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@ -77,7 +77,10 @@ extern "C" {
 #define PTCACHE_READ_OLD 3

 /* Structs */
+struct BlendDataReader;
+struct BlendWriter;
 struct ClothModifierData;
+struct DynamicPaintSurface;
 struct FluidModifierData;
 struct ListBase;
 struct Main;
@ -89,9 +92,6 @@ struct RigidBodyWorld;
 struct Scene;
 struct SoftBody;
 struct ViewLayer;
-struct BlendWriter;
-struct BlendDataReader;
-struct DynamicPaintSurface;

 /* temp structure for read/write */
 typedef struct PTCacheData {
--- a/source/blender/blenkernel/BKE_shader_fx.h
+++ b/source/blender/blenkernel/BKE_shader_fx.h
@ -27,14 +27,14 @@ extern "C" {
 #endif

 struct ARegionType;
+struct BlendDataReader;
+struct BlendLibReader;
+struct BlendWriter;
 struct ID;
 struct ListBase;
 struct ModifierUpdateDepsgraphContext;
 struct Object;
 struct ShaderFxData;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;

 #define SHADER_FX_ACTIVE(_fx, _is_render) \
  ((((_fx)->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \
--- a/source/blender/draw/engines/eevee/eevee_lightcache.h
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.h
@ -24,14 +24,14 @@

 #include "BLI_sys_types.h" /* for bool */

+struct BlendDataReader;
+struct BlendWriter;
 struct EEVEE_Data;
 struct EEVEE_ViewLayerData;
 struct LightCache;
 struct Scene;
 struct SceneEEVEE;
 struct ViewLayer;
-struct BlendWriter;
-struct BlendDataReader;

 /* Light Bake */
 struct wmJob *EEVEE_lightbake_job_create(struct wmWindowManager *wm,
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@ -28,8 +28,8 @@ extern "C" {
 #endif

 struct ARegion;
-struct FileSelectParams;
 struct FileAssetSelectParams;
+struct FileSelectParams;
 struct Scene;
 struct ScrArea;
 struct SpaceFile;
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@ -29,8 +29,8 @@ extern "C" {

 struct BlendHandle;
 struct FileList;
-struct FileSelection;
 struct FileSelectAssetLibraryUID;
+struct FileSelection;
 struct wmWindowManager;

 struct FileDirEntry;
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@ -32,7 +32,6 @@ extern "C" {
 /* internal exports only */

 struct ARegion;
-struct bContextDataResult;
 struct EditBone;
 struct ID;
 struct ListBase;
@ -43,6 +42,7 @@ struct TreeElement;
 struct TreeStoreElem;
 struct ViewLayer;
 struct bContext;
+struct bContextDataResult;
 struct bPoseChannel;
 struct wmKeyConfig;
 struct wmOperatorType;
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@ -32,8 +32,8 @@ extern "C" {
 #endif

 struct AnimData;
-struct MDeformVert;
 struct Curve;
+struct MDeformVert;

 #define GP_DEFAULT_PIX_FACTOR 1.0f
 #define GP_DEFAULT_GRID_LINES 4
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@ -33,6 +33,7 @@ extern "C" {
 #endif

 struct AnimData;
+struct Collection;
 struct ID;
 struct Image;
 struct ListBase;
@ -43,7 +44,6 @@ struct bNodePreview;
 struct bNodeTreeExec;
 struct bNodeType;
 struct uiBlock;
-struct Collection;

 #define NODE_MAXSTR 64

--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@ -39,6 +39,7 @@ extern "C" {
 struct AnimData;
 struct BoundBox;
 struct FluidsimSettings;
+struct GeometrySet;
 struct Ipo;
 struct Material;
 struct Mesh;
@ -49,7 +50,6 @@ struct RigidBodyOb;
 struct SculptSession;
 struct SoftBody;
 struct bGPdata;
-struct GeometrySet;

 /* Vertex Groups - Name Info */
 typedef struct bDeformGroup {
--- a/source/blender/modifiers/MOD_nodes.h
+++ b/source/blender/modifiers/MOD_nodes.h
@ -17,8 +17,8 @@
 #pragma once

 struct Main;
-struct Object;
 struct NodesModifierData;
+struct Object;

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.h
@ -27,6 +27,9 @@
 extern "C" {
 #endif

+struct BlendDataReader;
+struct BlendLibReader;
+struct BlendWriter;
 struct Depsgraph;
 struct Editing;
 struct GPUOffScreen;
@ -44,9 +47,6 @@ struct StripElem;
 struct TextVars;
 struct bContext;
 struct bSound;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;

 /* Wipe effect */
 enum {
--- a/source/blender/sequencer/intern/effects.h
+++ b/source/blender/sequencer/intern/effects.h
@ -28,8 +28,8 @@ extern "C" {
 #endif

 struct Scene;
-struct Sequence;
 struct SeqRenderData;
+struct Sequence;

 /* **********************************************************************
 * sequencer.c
--- a/source/blender/sequencer/intern/image_cache.h
+++ b/source/blender/sequencer/intern/image_cache.h
@ -30,8 +30,8 @@ extern "C" {
 struct ImBuf;
 struct Main;
 struct Scene;
-struct Sequence;
 struct SeqRenderData;
+struct Sequence;

 #ifdef __cplusplus
 }
--- a/source/blender/sequencer/intern/prefetch.h
+++ b/source/blender/sequencer/intern/prefetch.h
@ -28,8 +28,8 @@ extern "C" {
 #endif

 struct Scene;
-struct Sequence;
 struct SeqRenderData;
+struct Sequence;

 #ifdef __cplusplus
 }
--- a/source/blender/sequencer/intern/proxy.h
+++ b/source/blender/sequencer/intern/proxy.h
@ -27,10 +27,10 @@
 extern "C" {
 #endif

-struct anim;
 struct ImBuf;
 struct SeqRenderData;
 struct Sequence;
+struct anim;

 #define PROXY_MAXFILE (2 * FILE_MAXDIR + FILE_MAXFILE)
 struct ImBuf *seq_proxy_fetch(const struct SeqRenderData *context,
--- a/source/blender/sequencer/intern/strip_time.h
+++ b/source/blender/sequencer/intern/strip_time.h
@ -27,9 +27,9 @@
 extern "C" {
 #endif

+struct ListBase;
 struct Scene;
 struct Sequence;
-struct ListBase;

 float seq_give_frame_index(struct Sequence *seq, float timeline_frame);
 void seq_update_sound_bounds_recursive(struct Scene *scene, struct Sequence *metaseq);