[Bf-blender-cvs] [4b1f243e4d7] master: Cleanup: sort struct forward declarations
Campbell Barton
noreply at git.blender.org
Mon Jan 24 11:24:07 CET 2022
Commit: 4b1f243e4d76dc9b3e92a8c2bf43414bcda4b2c3
Author: Campbell Barton
Date: Mon Jan 24 21:16:06 2022 +1100
Branches: master
https://developer.blender.org/rB4b1f243e4d76dc9b3e92a8c2bf43414bcda4b2c3
Cleanup: sort struct forward declarations
===================================================================
M source/blender/blenkernel/BKE_blendfile_link_append.h
M source/blender/blenkernel/BKE_curve_to_mesh.hh
M source/blender/blenkernel/BKE_duplilist.h
M source/blender/blenkernel/BKE_idtype.h
M source/blender/blenkernel/BKE_node_tree_update.h
M source/blender/blenkernel/BKE_shrinkwrap.h
M source/blender/blenkernel/BKE_subdiv_eval.h
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_view_data.h
M source/blender/editors/asset/ED_asset_catalog.h
M source/blender/editors/asset/ED_asset_mark_clear.h
M source/blender/editors/include/ED_image.h
M source/blender/editors/include/UI_interface.hh
M source/blender/editors/include/UI_tree_view.hh
M source/blender/editors/space_file/file_intern.h
M source/blender/editors/space_node/node_context_path.cc
M source/blender/editors/space_outliner/tree/tree_display.hh
M source/blender/editors/space_sequencer/sequencer_intern.h
M source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
M source/blender/gpu/GPU_viewport.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/render/RE_bake.h
M source/blender/render/RE_texture_margin.h
M source/blender/sequencer/SEQ_utils.h
M source/blender/sequencer/intern/utils.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_blendfile_link_append.h b/source/blender/blenkernel/BKE_blendfile_link_append.h
index e55a2d15dcc..983c93223a1 100644
--- a/source/blender/blenkernel/BKE_blendfile_link_append.h
+++ b/source/blender/blenkernel/BKE_blendfile_link_append.h
@@ -30,8 +30,8 @@ struct LibraryLink_Params;
struct Main;
struct ReportList;
struct Scene;
-struct ViewLayer;
struct View3D;
+struct ViewLayer;
typedef struct BlendfileLinkAppendContext BlendfileLinkAppendContext;
typedef struct BlendfileLinkAppendContextItem BlendfileLinkAppendContextItem;
diff --git a/source/blender/blenkernel/BKE_curve_to_mesh.hh b/source/blender/blenkernel/BKE_curve_to_mesh.hh
index cf5c8b87ede..10649e8703f 100644
--- a/source/blender/blenkernel/BKE_curve_to_mesh.hh
+++ b/source/blender/blenkernel/BKE_curve_to_mesh.hh
@@ -16,8 +16,8 @@
#pragma once
-struct Mesh;
struct CurveEval;
+struct Mesh;
/** \file
* \ingroup bke
diff --git a/source/blender/blenkernel/BKE_duplilist.h b/source/blender/blenkernel/BKE_duplilist.h
index 5eff84b8c9e..303a83d921f 100644
--- a/source/blender/blenkernel/BKE_duplilist.h
+++ b/source/blender/blenkernel/BKE_duplilist.h
@@ -27,11 +27,11 @@ extern "C" {
#endif
struct Depsgraph;
+struct ID;
struct ListBase;
struct Object;
struct ParticleSystem;
struct Scene;
-struct ID;
/* ---------------------------------------------------- */
/* Dupli-Geometry */
diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h
index f83675fbb7e..df50f773a46 100644
--- a/source/blender/blenkernel/BKE_idtype.h
+++ b/source/blender/blenkernel/BKE_idtype.h
@@ -31,11 +31,11 @@
extern "C" {
#endif
+struct BPathForeachPathData;
struct BlendDataReader;
struct BlendExpander;
struct BlendLibReader;
struct BlendWriter;
-struct BPathForeachPathData;
struct ID;
struct LibraryForeachIDData;
struct Main;
diff --git a/source/blender/blenkernel/BKE_node_tree_update.h b/source/blender/blenkernel/BKE_node_tree_update.h
index f77bd83a8ef..443ceafb073 100644
--- a/source/blender/blenkernel/BKE_node_tree_update.h
+++ b/source/blender/blenkernel/BKE_node_tree_update.h
@@ -20,12 +20,12 @@
* \ingroup bke
*/
+struct ID;
+struct Main;
struct bNode;
+struct bNodeLink;
struct bNodeSocket;
struct bNodeTree;
-struct bNodeLink;
-struct Main;
-struct ID;
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 510d6773f6d..ea816812344 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -47,8 +47,8 @@ struct MDeformVert;
struct Mesh;
struct ModifierEvalContext;
struct Object;
-struct ShrinkwrapModifierData;
struct ShrinkwrapGpencilModifierData;
+struct ShrinkwrapModifierData;
struct SpaceTransform;
/* Information about boundary edges in the mesh. */
diff --git a/source/blender/blenkernel/BKE_subdiv_eval.h b/source/blender/blenkernel/BKE_subdiv_eval.h
index 2eb64ae795d..23bcdcce276 100644
--- a/source/blender/blenkernel/BKE_subdiv_eval.h
+++ b/source/blender/blenkernel/BKE_subdiv_eval.h
@@ -30,8 +30,8 @@ extern "C" {
#endif
struct Mesh;
-struct Subdiv;
struct OpenSubdiv_EvaluatorCache;
+struct Subdiv;
typedef enum eSubdivEvaluatorType {
SUBDIV_EVALUATOR_TYPE_CPU,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 787e3799029..d699c799e40 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -71,8 +71,8 @@ struct Scene;
struct Simulation;
struct Speaker;
struct Tex;
-struct ViewLayer;
struct VFont;
+struct ViewLayer;
struct World;
struct bAction;
struct bArmature;
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 6c3e0773a15..fdb7cfba580 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -24,12 +24,12 @@
struct DRWShadingGroup;
struct FluidModifierData;
+struct GPUMaterial;
struct ModifierData;
struct Object;
struct ParticleSystem;
struct RegionView3D;
struct ViewLayer;
-struct GPUMaterial;
#define UBO_FIRST_COLOR colorWire
#define UBO_LAST_COLOR colorUVShadow
diff --git a/source/blender/draw/intern/draw_view_data.h b/source/blender/draw/intern/draw_view_data.h
index 494c28cc067..b37e48c11e8 100644
--- a/source/blender/draw/intern/draw_view_data.h
+++ b/source/blender/draw/intern/draw_view_data.h
@@ -31,9 +31,9 @@
extern "C" {
#endif
-struct GPUViewport;
-struct DrawEngineType;
struct DRWRegisteredDrawEngine;
+struct DrawEngineType;
+struct GPUViewport;
/* NOTE these structs are only here for reading the actual lists from the engine.
* The actual length of them is stored in a ViewportEngineData_Info.
diff --git a/source/blender/editors/asset/ED_asset_catalog.h b/source/blender/editors/asset/ED_asset_catalog.h
index be99de01173..acb0b67d9c0 100644
--- a/source/blender/editors/asset/ED_asset_catalog.h
+++ b/source/blender/editors/asset/ED_asset_catalog.h
@@ -28,8 +28,8 @@
extern "C" {
#endif
-struct Main;
struct AssetLibrary;
+struct Main;
void ED_asset_catalogs_save_from_main_path(struct AssetLibrary *library, const struct Main *bmain);
diff --git a/source/blender/editors/asset/ED_asset_mark_clear.h b/source/blender/editors/asset/ED_asset_mark_clear.h
index 512a1d94535..8f10e769c52 100644
--- a/source/blender/editors/asset/ED_asset_mark_clear.h
+++ b/source/blender/editors/asset/ED_asset_mark_clear.h
@@ -25,8 +25,8 @@ extern "C" {
#endif
struct ID;
-struct bContext;
struct Main;
+struct bContext;
/**
* Mark the datablock as asset.
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index c5e8c2ee096..3c1b8e4ecc1 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -38,10 +38,10 @@ struct Main;
struct ReportList;
struct Scene;
struct SpaceImage;
+struct View2D;
struct bContext;
struct wmOperator;
struct wmWindowManager;
-struct View2D;
/* image_draw.c */
float ED_space_image_zoom_level(const struct View2D *v2d, int grid_dimension);
diff --git a/source/blender/editors/include/UI_interface.hh b/source/blender/editors/include/UI_interface.hh
index a52b4ebd338..8d1ca54b7a1 100644
--- a/source/blender/editors/include/UI_interface.hh
+++ b/source/blender/editors/include/UI_interface.hh
@@ -31,8 +31,8 @@ namespace blender::nodes::geometry_nodes_eval_log {
struct GeometryAttributeInfo;
}
-struct uiBlock;
struct StructRNA;
+struct uiBlock;
struct uiSearchItems;
namespace blender::ui {
diff --git a/source/blender/editors/include/UI_tree_view.hh b/source/blender/editors/include/UI_tree_view.hh
index 8208f8daf5d..8dee88defb3 100644
--- a/source/blender/editors/include/UI_tree_view.hh
+++ b/source/blender/editors/include/UI_tree_view.hh
@@ -40,8 +40,8 @@ struct uiBlock;
struct uiBut;
struct uiButTreeRow;
struct uiLayout;
-struct wmEvent;
struct wmDrag;
+struct wmEvent;
namespace blender::ui {
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h
index 4334beea196..bd55e6f78ab 100644
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@ -34,11 +34,11 @@ extern "C" {
struct ARegion;
struct ARegionType;
struct AssetLibrary;
-struct FileSelectParams;
struct FileAssetSelectParams;
+struct FileSelectParams;
struct SpaceFile;
-struct uiLayout;
struct View2D;
+struct uiLayout;
/* file_draw.c */
diff --git a/source/blender/editors/space_node/node_context_path.cc b/source/blender/editors/space_node/node_context_path.cc
index 2f3855fd654..cab7cbf10be 100644
--- a/source/blender/editors/space_node/node_context_path.cc
+++ b/source/blender/editors/space_node/node_context_path.cc
@@ -45,11 +45,11 @@
#include "node_intern.hh"
-struct Mesh;
struct Curve;
struct Light;
-struct World;
struct Material;
+struct Mesh;
+struct World;
namespace blender::ed::space_node {
diff --git a/source/blender/editors/space_outliner/tree/tree_display.hh b/source/blender/editors/space_outliner/tree/tree_display.hh
index 8005b7d17dd..68f0f9c562d 100644
--- a/source/blender/editors/space_outliner/tree/tree_display.hh
+++ b/source/blender/editors/space_outliner/tree/tree_display.hh
@@ -38,8 +38,8 @@
struct ID;
struct LayerCollection;
-struct ListBase;
struct Library;
+struct ListBase;
struct Main;
struct Scene;
struct Sequence;
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index 8f7ab2ea881..7143a1fa1ca 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -33,13 +33,13 @@ struct ARegionType;
struct Depsgraph;
struct Main;
struct Scene;
-struct Sequence;
struct SeqCollection;
+struct Sequence;
struct SpaceSeq;
struct StripElem;
+struct View2D;
struct bContext;
struct rctf;
-struct View2D;
struct wmOperator;
#define OVERLAP_ALPHA 180
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
index 64672b919cd..df23a27aa22 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_intern.hh
@@ -36,8 +36,8 @@ struct SpaceSpreadsheet_Runtime {
}
};
-struct bContext;
struct ARegionType;
+struct bContext;
void spreadsheet_operatortypes();
void spreadsheet_update_context_path(const bContext *C);
diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h
index c4948d68298..917b87efeaa 100644
--- a/source/blender/gpu/GPU_viewport.h
+++ b/source/blender/gpu/GPU_viewport.h
@@ -40,10 +40,10 @@ extern "C" {
typedef struct GHash GHash;
typedef struct GPUViewport GPUViewport;
-struct GPUFrameBuffer;
+struct DRWData;
struct DefaultFramebufferList;
struct DefaultTextureList;
-struct DRWData;
+struct GPUFrameBuffer;
GPUVie
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list