[Bf-blender-cvs] [a869a61c88e] master: Cleanup: sort struct blocks
Campbell Barton
noreply at git.blender.org
Wed Dec 16 07:52:02 CET 2020
Commit: a869a61c88e37ce8a16676162ef7db3c62449b46
Author: Campbell Barton
Date: Wed Dec 16 16:26:23 2020 +1100
Branches: master
https://developer.blender.org/rBa869a61c88e37ce8a16676162ef7db3c62449b46
Cleanup: sort struct blocks
===================================================================
M source/blender/blenkernel/BKE_action.h
M source/blender/blenkernel/BKE_anim_visualization.h
M source/blender/blenkernel/BKE_asset.h
M source/blender/blenkernel/BKE_collision.h
M source/blender/blenkernel/BKE_constraint.h
M source/blender/blenkernel/BKE_cryptomatte.h
M source/blender/blenkernel/BKE_geometry_set.h
M source/blender/blenkernel/BKE_geometry_set.hh
M source/blender/blenkernel/BKE_gpencil.h
M source/blender/blenkernel/BKE_gpencil_curve.h
M source/blender/blenkernel/BKE_gpencil_geom.h
M source/blender/blenkernel/BKE_gpencil_modifier.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/BKE_shader_fx.h
M source/blender/draw/engines/eevee/eevee_lightcache.h
M source/blender/editors/include/ED_fileselect.h
M source/blender/editors/space_file/filelist.h
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_object_types.h
M source/blender/modifiers/MOD_nodes.h
M source/blender/sequencer/SEQ_sequencer.h
M source/blender/sequencer/intern/effects.h
M source/blender/sequencer/intern/image_cache.h
M source/blender/sequencer/intern/prefetch.h
M source/blender/sequencer/intern/proxy.h
M source/blender/sequencer/intern/strip_time.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index d8605941974..717cfa607ad 100644
--- 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 */
diff --git a/source/blender/blenkernel/BKE_anim_visualization.h b/source/blender/blenkernel/BKE_anim_visualization.h
index decb2e0b210..4e86abeed8d 100644
--- 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 */
diff --git a/source/blender/blenkernel/BKE_asset.h b/source/blender/blenkernel/BKE_asset.h
index 20df6109c13..38cd5747343 100644
--- 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;
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index a10a4e3c7fd..ff1bca896b1 100644
--- 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;
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 7a14787c191..afad1e26159 100644
--- 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
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index d984b3824b1..433c25084ad 100644
--- 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);
diff --git a/source/blender/blenkernel/BKE_geometry_set.h b/source/blender/blenkernel/BKE_geometry_set.h
index 87bb96be145..37a3ed82bb8 100644
--- 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);
diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh
index 617e0c45ae4..90d444aa270 100644
--- 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 Collection;
struct Mesh;
-struct PointCloud;
struct Object;
-struct Collection;
+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.
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 9177931cf9b..df5711f5120 100644
--- 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))
diff --git a/source/blender/blenkernel/BKE_gpencil_curve.h b/source/blender/blenkernel/BKE_gpencil_curve.h
index 1821972469c..2d42bb36949 100644
--- 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,
diff --git a/source/blender/blenkernel/BKE_gpencil_geom.h b/source/blender/blenkernel/BKE_gpencil_geom.h
index 8cb7137e1f0..1c86df73d3c 100644
--- 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]);
diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h
index ccf65a585ef..61ccf3d60f6 100644
--- 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;
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 38b449cd92d..685a8ed98e2 100644
--- 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 */
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index f679533e1a9..aaed2649ad9 100644
--- 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];
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 2ac39be7eb3..3913ede9049 100644
--- 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;
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index d3ae043588d..170eb4ba662 100644
--- 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 {
diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h
index b5b5f61a6a6..23bd62c70bc 100644
--- 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)) || \
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h
index 17392c0de0b..fde0c80ab37 100644
--- 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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list