diff options
Diffstat (limited to 'source')
252 files changed, 932 insertions, 932 deletions
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/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -38,8 +38,8 @@ extern "C" { /* Structs */ -struct Base; struct BLI_Iterator; +struct Base; struct Collection; struct Depsgraph; struct ID; diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index 9bd1f5385da..080ceb9eb60 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -43,14 +43,14 @@ #include "BLI_kdopbvh.h" -struct CollisionModifierData; struct Collection; +struct CollisionModifierData; +struct Depsgraph; struct MFace; struct MVert; +struct MVertTri; struct Object; struct Scene; -struct Depsgraph; -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 aa3721d7a14..b9da38c7404 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 9e723b49b63..1d05a81c931 100644 --- a/source/blender/blenkernel/BKE_constraint.h +++ b/source/blender/blenkernel/BKE_constraint.h @@ -33,14 +33,14 @@ * \author Joshua Leung (major recode 2007) */ +struct Depsgraph; struct ID; -struct bConstraint; -struct bConstraintTarget; struct ListBase; struct Object; struct Scene; +struct bConstraint; +struct bConstraintTarget; struct bPoseChannel; -struct Depsgraph; /* ---------------------------------------------------------------------------- */ #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index f78740fd03a..20b8c3a2b09 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -38,41 +38,41 @@ extern "C" { #endif struct ARegion; -struct bScreen; +struct Base; +struct Brush; struct CacheFile; struct Collection; struct Depsgraph; +struct EditBone; +struct ID; +struct Image; struct LayerCollection; struct ListBase; struct Main; struct Object; -struct Base; struct PointerRNA; +struct RegionView3D; +struct RenderEngineType; struct ReportList; struct Scene; -struct ViewLayer; struct ScrArea; +struct SpaceClip; +struct SpaceImage; struct SpaceLink; -struct View3D; -struct ViewRender; -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 ViewLayer; +struct ViewRender; struct bGPDframe; -struct Brush; +struct bGPDlayer; +struct bGPdata; +struct bPoseChannel; +struct bScreen; struct wmWindow; struct wmWindowManager; -struct RenderEngineType; -struct SpaceText; -struct SpaceImage; -struct SpaceClip; -struct ID; #include "DNA_object_enums.h" diff --git a/source/blender/blenkernel/BKE_crazyspace.h b/source/blender/blenkernel/BKE_crazyspace.h index e9745ed50fa..5b03dfbffd8 100644 --- a/source/blender/blenkernel/BKE_crazyspace.h +++ b/source/blender/blenkernel/BKE_crazyspace.h @@ -34,11 +34,11 @@ #ifdef __cplusplus extern "C" { #endif -struct Scene; -struct Object; struct BMEditMesh; -struct Mesh; struct Depsgraph; +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 ebbdbc7f7a0..4db9fc911ed 100644 --- a/source/blender/blenkernel/BKE_curve.h +++ b/source/blender/blenkernel/BKE_curve.h @@ -35,15 +35,15 @@ struct BezTriple; struct Curve; -struct EditNurb; struct Depsgraph; +struct EditNurb; struct GHash; 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 0be8e760cae..d7d896ccd17 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*/ @@ -420,8 +420,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 7d0bb67c54d..d6fba546088 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -40,9 +40,9 @@ extern "C" { struct Depsgraph; 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 a29f4197299..e39ba51bdd1 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_displist.h b/source/blender/blenkernel/BKE_displist.h index e6b08a8a063..394512d39f6 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -58,9 +58,9 @@ enum { /* prototypes */ struct Depsgraph; -struct Mesh; struct ListBase; struct Main; +struct Mesh; struct Object; struct Scene; diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index de4efaf37b0..548bafdbdd1 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -34,14 +34,14 @@ #include "BKE_customdata.h" #include "bmesh.h" -struct BMesh; struct BMLoop; -struct Mesh; -struct Scene; -struct DerivedMesh; -struct MeshStatVis; +struct BMesh; struct Depsgraph; +struct DerivedMesh; struct EditMeshData; +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 9ba1bbdee07..845c6846708 100644 --- a/source/blender/blenkernel/BKE_effect.h +++ b/source/blender/blenkernel/BKE_effect.h @@ -37,14 +37,14 @@ #include "BLI_utildefines.h" -struct Object; -struct Scene; -struct ListBase; struct Collection; -struct ParticleSimulationData; +struct Depsgraph; +struct ListBase; +struct Object; struct ParticleData; struct ParticleKey; -struct Depsgraph; +struct ParticleSimulationData; +struct Scene; struct ViewLayer; struct EffectorWeights *BKE_effector_add_weights(struct Collection *collection); diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index fd39e735fd7..23d812c72ce 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 4883f2392b0..26abb4fde4b 100644 --- a/source/blender/blenkernel/BKE_fluidsim.h +++ b/source/blender/blenkernel/BKE_fluidsim.h @@ -32,11 +32,11 @@ * \ingroup bke */ -struct Object; -struct Scene; +struct Depsgraph; struct FluidsimSettings; struct MVert; -struct Depsgraph; +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 32bd1c1be7d..dee46945287 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 8c680feb04c..03628d9f477 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -31,27 +31,27 @@ * \author Joshua Leung */ +struct ArrayGpencilModifierData; +struct BoundBox; +struct Brush; struct CurveMapping; struct Depsgraph; struct GpencilModifierData; -struct ToolSettings; +struct LatticeGpencilModifierData; struct ListBase; -struct bGPdata; -struct bGPDlayer; -struct bGPDframe; -struct bGPDspoint; -struct bGPDstroke; -struct Material; -struct bGPDpalette; -struct bGPDpalettecolor; struct Main; -struct BoundBox; -struct Brush; +struct Material; struct Object; -struct bDeformGroup; struct SimplifyGpencilModifierData; -struct ArrayGpencilModifierData; -struct LatticeGpencilModifierData; +struct ToolSettings; +struct bDeformGroup; +struct bGPDframe; +struct bGPDlayer; +struct bGPDpalette; +struct bGPDpalettecolor; +struct bGPDspoint; +struct bGPDstroke; +struct bGPdata; struct MDeformVert; struct MDeformWeight; diff --git a/source/blender/blenkernel/BKE_gpencil_modifier.h b/source/blender/blenkernel/BKE_gpencil_modifier.h index 8acbfac7981..018f5558e0d 100644 --- a/source/blender/blenkernel/BKE_gpencil_modifier.h +++ b/source/blender/blenkernel/BKE_gpencil_modifier.h @@ -30,24 +30,24 @@ #include "BLI_compiler_attrs.h" #include "BKE_customdata.h" -struct ID; +struct BMEditMesh; +struct DepsNodeHandle; struct Depsgraph; struct DerivedMesh; -struct bContext; /* NOTE: bakeModifier() - called from UI - needs to create new datablocks, hence the need for this */ +struct GpencilModifierData; +struct ID; +struct ListBase; +struct Main; struct Mesh; +struct ModifierUpdateDepsgraphContext; struct Object; struct Scene; struct ViewLayer; -struct ListBase; struct bArmature; -struct Main; -struct GpencilModifierData; -struct BMEditMesh; -struct DepsNodeHandle; -struct bGPDlayer; +struct bContext; /* NOTE: bakeModifier() - called from UI - needs to create new datablocks, hence the need for this */ struct bGPDframe; +struct bGPDlayer; struct bGPDstroke; -struct ModifierUpdateDepsgraphContext; #define GPENCIL_MODIFIER_ACTIVE(_md, _is_render) \ ((((_md)->mode & eGpencilModifierMode_Realtime) && (_is_render == false)) || \ diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index 7a5262e0a14..edbff201117 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -78,9 +78,9 @@ struct Icon_Geom { typedef struct Icon Icon; +struct ID; struct ImBuf; struct PreviewImage; -struct ID; struct StudioLight; struct bGPDlayer; diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 6df31db7b83..7cf252ba910 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -36,8 +36,8 @@ extern "C" { #endif -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 0b21ecf8e02..495ec700cf4 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 a175ea93240..2b84bd1091e 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 b2911129525..85da22c8d93 100644 --- a/source/blender/blenkernel/BKE_lattice.h +++ b/source/blender/blenkernel/BKE_lattice.h @@ -36,14 +36,14 @@ #include "BLI_compiler_attrs.h" +struct BPoint; +struct Depsgraph; struct Lattice; +struct MDeformVert; struct Main; struct Mesh; struct Object; struct Scene; -struct BPoint; -struct MDeformVert; -struct Depsgraph; struct bGPDstroke; void BKE_lattice_resize(struct Lattice *lt, int u, int v, int w, struct Object *ltOb); diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 0560646c49b..27f6435e20d 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -58,15 +58,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_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h index a769b6653d7..dac0d1f8ac8 100644 --- a/source/blender/blenkernel/BKE_lightprobe.h +++ b/source/blender/blenkernel/BKE_lightprobe.h @@ -33,8 +33,8 @@ * \brief General operations for probes. */ -struct Main; struct LightProbe; +struct Main; void BKE_lightprobe_init(struct LightProbe *probe); void *BKE_lightprobe_add(struct Main *bmain, const char *name); diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h index 376a324d25c..364de104a1c 100644 --- a/source/blender/blenkernel/BKE_linestyle.h +++ b/source/blender/blenkernel/BKE_linestyle.h @@ -44,11 +44,11 @@ extern "C" { #define LS_MODIFIER_TYPE_THICKNESS 3 #define LS_MODIFIER_TYPE_GEOMETRY 4 +struct ColorBand; struct Main; struct Object; -struct ColorBand; -struct bContext; struct ViewLayer; +struct bContext; void BKE_linestyle_init(struct FreestyleLineStyle *linestyle); FreestyleLineStyle *BKE_linestyle_new(struct Main *bmain, const char *name); diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index e5a816b92ce..cc0441a263b 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -49,8 +49,8 @@ extern "C" { #endif -struct BlendThumbnail; struct BLI_mempool; +struct BlendThumbnail; struct Depsgraph; struct GHash; struct ImBuf; diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index e0383f7e5ba..57d03c50005 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -33,14 +33,14 @@ */ struct Depsgraph; -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 890272aae64..d71bfcf3795 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 a7706915bc5..fffabd1536d 100644 --- a/source/blender/blenkernel/BKE_mball.h +++ b/source/blender/blenkernel/BKE_mball.h @@ -36,9 +36,9 @@ struct BoundBox; struct Depsgraph; 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 53c23af73c0..d369a2b6cce 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -37,37 +37,37 @@ /* defines CustomDataMask */ #include "BKE_customdata.h" -struct ID; +struct BLI_Stack; +struct BMEditMesh; +struct BMesh; struct BMeshCreateParams; struct BMeshFromMeshParams; struct BMeshToMeshParams; struct BoundBox; +struct CustomData; struct Depsgraph; struct EdgeHash; -struct ListBase; -struct LinkNode; -struct BLI_Stack; -struct MemArena; -struct BMesh; +struct ID; struct KeyBlock; +struct LinkNode; +struct ListBase; +struct MDeformVert; +struct MDisps; +struct MEdge; +struct MFace; +struct MLoop; struct MLoopTri; -struct Main; -struct Mesh; -struct ModifierData; +struct MLoopUV; struct MPoly; -struct MLoop; -struct MFace; -struct MEdge; struct MVert; struct MVertTri; -struct MDeformVert; -struct MDisps; +struct Main; +struct MemArena; +struct Mesh; +struct ModifierData; struct Object; -struct CustomData; -struct Scene; -struct MLoopUV; struct ReportList; -struct BMEditMesh; +struct Scene; #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/BKE_mesh_iterators.h b/source/blender/blenkernel/BKE_mesh_iterators.h index 70c10806350..64b584f6938 100644 --- a/source/blender/blenkernel/BKE_mesh_iterators.h +++ b/source/blender/blenkernel/BKE_mesh_iterators.h @@ -28,13 +28,13 @@ * \ingroup bke */ -struct Mesh; -struct MVert; struct MEdge; -struct MPoly; struct MLoop; -struct MLoopUV; struct MLoopTri; +struct MLoopUV; +struct MPoly; +struct MVert; +struct Mesh; typedef enum MeshForeachFlag { MESH_FOREACH_NOP = 0, 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_mesh_remap.h b/source/blender/blenkernel/BKE_mesh_remap.h index 7aea856ff34..63b28300c56 100644 --- a/source/blender/blenkernel/BKE_mesh_remap.h +++ b/source/blender/blenkernel/BKE_mesh_remap.h @@ -26,9 +26,9 @@ */ struct CustomData; -struct Mesh; struct MVert; struct MemArena; +struct Mesh; /* Generic ways to map some geometry elements from a source mesh to a dest one. */ diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index 49e452edc36..8211a7301ff 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -39,10 +39,10 @@ struct ColorBand; struct CustomData; struct Depsgraph; struct KeyBlock; -struct Mesh; struct MLoop; struct MLoopTri; struct MVertTri; +struct Mesh; struct Object; struct Scene; diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index c228e56e88d..553708a8f7e 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -32,19 +32,19 @@ #include "BLI_compiler_attrs.h" #include "BKE_customdata.h" -struct ID; +struct BMEditMesh; +struct DepsNodeHandle; struct Depsgraph; struct DerivedMesh; +struct ID; +struct ListBase; +struct Main; struct Mesh; +struct ModifierData; struct Object; struct Scene; struct ViewLayer; -struct ListBase; struct bArmature; -struct Main; -struct ModifierData; -struct BMEditMesh; -struct DepsNodeHandle; 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 f246522fffe..839b50ab4bf 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -48,9 +48,9 @@ struct Scene; struct SubdivCCG; 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 a42819e52a2..3c2a005da02 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 0368f5befd3..240b21c9c08 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -51,35 +51,35 @@ /* 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 SpaceNode; struct Tex; struct ViewRender; -struct SpaceNode; -struct ARegion; -struct ColorManagedViewSettings; -struct ColorManagedDisplaySettings; +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 3348131cc4b..76647817b88 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -36,24 +36,24 @@ extern "C" { #include "BLI_compiler_attrs.h" struct Base; +struct BoundBox; struct Depsgraph; struct GpencilModifierData; -struct Scene; -struct ShaderFxData; -struct ViewLayer; +struct HookGpencilModifierData; +struct HookModifierData; struct ID; -struct Object; -struct BoundBox; -struct View3D; -struct SoftBody; -struct MovieClip; struct Main; struct Mesh; -struct RigidBodyWorld; -struct HookModifierData; struct ModifierData; -struct HookGpencilModifierData; +struct MovieClip; +struct Object; struct RegionView3D; +struct RigidBodyWorld; +struct Scene; +struct ShaderFxData; +struct SoftBody; +struct View3D; +struct ViewLayer; #include "DNA_object_enums.h" diff --git a/source/blender/blenkernel/BKE_object_deform.h b/source/blender/blenkernel/BKE_object_deform.h index c94b142af9f..c694fa39749 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_object_facemap.h b/source/blender/blenkernel/BKE_object_facemap.h index 2607e5aa2dd..b75e22afd7a 100644 --- a/source/blender/blenkernel/BKE_object_facemap.h +++ b/source/blender/blenkernel/BKE_object_facemap.h @@ -32,9 +32,9 @@ extern "C" { #endif -struct bFaceMap; struct ListBase; struct Object; +struct bFaceMap; struct bFaceMap *BKE_object_facemap_add(struct Object *ob); struct bFaceMap *BKE_object_facemap_add_name(struct Object *ob, const char *name); diff --git a/source/blender/blenkernel/BKE_outliner_treehash.h b/source/blender/blenkernel/BKE_outliner_treehash.h index 8a14f8fb041..9fc3fd68a54 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 4f9c0f4ee2e..fd6417f504d 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -32,38 +32,38 @@ * \ingroup bke */ -struct bContext; -struct bToolRef; -struct BMesh; struct BMFace; +struct BMesh; struct Brush; struct CurveMapping; +struct Depsgraph; struct EnumPropertyItem; -struct MeshElemMap; struct GridPaintMask; -struct Main; -struct Mesh; +struct ImagePool; +struct MFace; struct MLoop; struct MLoopTri; -struct MFace; struct MVert; +struct Main; +struct Mesh; +struct MeshElemMap; struct Object; +struct PBVH; struct Paint; struct PaintCurve; struct Palette; struct PaletteColor; -struct PBVH; struct ReportList; struct Scene; -struct ViewLayer; struct Sculpt; struct StrokeCache; struct SubdivCCG; struct Tex; -struct ImagePool; -struct UnifiedPaintSettings; -struct Depsgraph; struct ToolSettings; +struct UnifiedPaintSettings; +struct ViewLayer; +struct bContext; +struct bToolRef; enum eOverlayFlags; diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index ee8612c3d7b..c23aa2f709c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -41,28 +41,28 @@ #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 Depsgraph; -struct ModifierData; -struct MTFace; +struct Depsgraph; +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 Depsgraph; +struct Scene; struct ViewLayer; #define PARTICLE_COLLISION_MAX_COLLISIONS 10 diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 0067f63ded0..7297ed415b6 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -30,20 +30,20 @@ #include "BLI_ghash.h" #include "BLI_utildefines.h" -struct GPUBatch; +struct BMLog; +struct BMesh; +struct CCGDerivedMesh; struct CCGElem; struct CCGKey; -struct CCGDerivedMesh; struct CustomData; struct DMFlagMat; -struct MPoly; +struct GPUBatch; 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 f13f84e4eb2..b768cc185fe 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -89,11 +89,11 @@ struct Object; struct ParticleKey; struct ParticleSystem; struct PointCache; +struct RigidBodyWorld; struct Scene; -struct ViewLayer; struct SmokeModifierData; struct SoftBody; -struct RigidBodyWorld; +struct ViewLayer; struct OpenVDBReader; struct OpenVDBWriter; diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h index 9a5f3c31264..dd985a04091 100644 --- a/source/blender/blenkernel/BKE_rigidbody.h +++ b/source/blender/blenkernel/BKE_rigidbody.h @@ -34,8 +34,8 @@ #ifndef __BKE_RIGIDBODY_H__ #define __BKE_RIGIDBODY_H__ -struct RigidBodyWorld; struct RigidBodyOb; +struct RigidBodyWorld; struct Collection; struct Depsgraph; diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 208afa4b67a..a71fcce92cb 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -44,11 +44,11 @@ struct Main; struct Object; struct RenderData; struct Scene; -struct ViewLayer; +struct TransformOrientation; struct UnitSettings; +struct ViewLayer; struct ViewRender; struct WorkSpace; -struct TransformOrientation; typedef enum eSceneCopyMethod { SCE_COPY_NEW = 0, diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 6b96703a344..66141e91b0d 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; @@ -41,25 +42,24 @@ struct Menu; struct Panel; struct Scene; struct ScrArea; +struct ScrAreaMap; struct ScrVert; struct SpaceType; struct TransformOrientation; struct View3D; struct View3DShading; +struct WorkSpace; struct bContext; struct bContextDataResult; struct bScreen; struct uiLayout; struct uiList; -struct wmKeyConfig; struct wmGizmoMap; +struct wmKeyConfig; +struct wmMsgBus; struct wmNotifier; struct wmWindow; struct wmWindowManager; -struct WorkSpace; -struct GPUFXSettings; -struct wmMsgBus; -struct ScrAreaMap; #include "BLI_compiler_attrs.h" diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h index f5c917302ea..fa0f1776ae9 100644 --- a/source/blender/blenkernel/BKE_sequencer.h +++ b/source/blender/blenkernel/BKE_sequencer.h @@ -30,13 +30,11 @@ * \ingroup bke */ -struct bContext; struct Depsgraph; -struct StripColorBalance; struct Editing; -struct GSet; -struct GPUOffScreen; struct GPUFX; +struct GPUOffScreen; +struct GSet; struct ImBuf; struct Main; struct Mask; @@ -45,8 +43,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_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h index 3306d8256e8..94d817e104d 100644 --- a/source/blender/blenkernel/BKE_shader_fx.h +++ b/source/blender/blenkernel/BKE_shader_fx.h @@ -30,22 +30,22 @@ #include "BLI_compiler_attrs.h" #include "BKE_customdata.h" -struct ID; +struct DepsNodeHandle; struct Depsgraph; struct DerivedMesh; +struct ID; +struct ListBase; +struct Main; struct Mesh; +struct ModifierUpdateDepsgraphContext; struct Object; struct Scene; +struct ShaderFxData; struct ViewLayer; -struct ListBase; struct bArmature; -struct Main; -struct ShaderFxData; -struct DepsNodeHandle; -struct bGPDlayer; struct bGPDframe; +struct bGPDlayer; struct bGPDstroke; -struct ModifierUpdateDepsgraphContext; #define SHADER_FX_ACTIVE(_fx, _is_render) (((_fx->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \ ((_fx->mode & eShaderFxMode_Render) && (_is_render == true))) diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 0959e8a72f0..b5e4f5148ed 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -47,13 +47,13 @@ * (So that you don't have to pass an enormous amount of arguments to functions) */ -struct Object; -struct Mesh; -struct MVert; +struct BVHTree; struct MDeformVert; +struct MVert; +struct Mesh; struct ModifierEvalContext; +struct Object; struct ShrinkwrapModifierData; -struct BVHTree; struct SpaceTransform; /* Information about boundary edges in the mesh. */ diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 98fb4f47339..e1db0b258af 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 c709eb80753..20ae85f23fe 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 2f0d62b4b42..281a30a2985 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -37,15 +37,14 @@ extern "C" { #endif -struct bNode; struct Brush; struct ColorBand; struct FreestyleLineStyle; struct ImagePool; struct Lamp; +struct MTex; struct Main; struct Material; -struct MTex; struct OceanTex; struct ParticleSettings; struct PointDensity; @@ -53,6 +52,7 @@ struct Tex; struct TexMapping; struct TexResult; 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 7a70f945194..f78c344478a 100644 --- a/source/blender/blenkernel/BKE_tracking.h +++ b/source/blender/blenkernel/BKE_tracking.h @@ -32,22 +32,22 @@ * \author Sergey Sharybin */ +struct Camera; struct Depsgraph; -struct bGPDlayer; 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/BKE_workspace.h b/source/blender/blenkernel/BKE_workspace.h index 6902fb631e4..14b9047c02d 100644 --- a/source/blender/blenkernel/BKE_workspace.h +++ b/source/blender/blenkernel/BKE_workspace.h @@ -27,12 +27,12 @@ #include "BLI_compiler_attrs.h" -struct bScreen; -struct bToolRef; struct Main; struct Scene; struct TransformOrientation; struct ViewLayer; +struct bScreen; +struct bToolRef; /* -------------------------------------------------------------------- */ /* Create, delete, init */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index e8ed186a8a1..779434bfabc 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; @@ -174,9 +174,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/blenlib/BLI_array_store.h b/source/blender/blenlib/BLI_array_store.h index f4cbc07bf26..c0c16b83466 100644 --- a/source/blender/blenlib/BLI_array_store.h +++ b/source/blender/blenlib/BLI_array_store.h @@ -26,8 +26,8 @@ * \brief Efficient in-memory storage of multiple similar arrays. */ -typedef struct BArrayStore BArrayStore; typedef struct BArrayState BArrayState; +typedef struct BArrayStore BArrayStore; BArrayStore *BLI_array_store_create( unsigned int stride, unsigned int chunk_count); diff --git a/source/blender/blenlib/BLI_callbacks.h b/source/blender/blenlib/BLI_callbacks.h index 2bbd82f6db8..818a3e8e29b 100644 --- a/source/blender/blenlib/BLI_callbacks.h +++ b/source/blender/blenlib/BLI_callbacks.h @@ -25,8 +25,8 @@ #ifndef __BLI_CALLBACKS_H__ #define __BLI_CALLBACKS_H__ -struct Main; struct ID; +struct Main; /** * Common suffix uses: diff --git a/source/blender/blenlib/BLI_linklist.h b/source/blender/blenlib/BLI_linklist.h index 214915163c7..bd1ce15beeb 100644 --- a/source/blender/blenlib/BLI_linklist.h +++ b/source/blender/blenlib/BLI_linklist.h @@ -34,8 +34,8 @@ #include "BLI_compiler_attrs.h" -struct MemArena; struct BLI_mempool; +struct MemArena; typedef void (*LinkNodeFreeFP)(void *link); typedef void (*LinkNodeApplyFP)(void *link, void *userdata); diff --git a/source/blender/blenlib/BLI_uvproject.h b/source/blender/blenlib/BLI_uvproject.h index 516a9b8b237..2a61acc8b36 100644 --- a/source/blender/blenlib/BLI_uvproject.h +++ b/source/blender/blenlib/BLI_uvproject.h @@ -24,8 +24,8 @@ * \ingroup bli */ -struct ProjCameraInfo; struct Object; +struct ProjCameraInfo; /* create uv info from the camera, needs to be freed */ struct ProjCameraInfo *BLI_uvproject_camera_info(struct Object *ob, float rotmat[4][4], float winx, float winy); diff --git a/source/blender/blenlib/intern/BLI_timer.c b/source/blender/blenlib/intern/BLI_timer.c index fdd89771077..56396074220 100644 --- a/source/blender/blenlib/intern/BLI_timer.c +++ b/source/blender/blenlib/intern/BLI_timer.c @@ -157,8 +157,8 @@ void BLI_timer_free() remove_tagged_functions(); } -struct Main; struct ID; +struct Main; static void remove_non_persistent_functions(struct Main *UNUSED(_1), struct ID *UNUSED(_2), void *UNUSED(_3)) { LISTBASE_FOREACH(TimedFunction *, timed_func, &GlobalTimer.funcs) { diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index 0a4832ef604..05f9a5d274d 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -36,20 +36,20 @@ extern "C" { #endif +struct BHead; struct BlendThumbnail; -struct bScreen; +struct FileData; struct LinkNode; struct ListBase; struct Main; struct MemFile; struct ReportList; struct Scene; -struct ViewLayer; struct UserDef; struct View3D; +struct ViewLayer; struct bContext; -struct BHead; -struct FileData; +struct bScreen; struct wmWindowManager; typedef struct BlendHandle BlendHandle; diff --git a/source/blender/blenloader/BLO_writefile.h b/source/blender/blenloader/BLO_writefile.h index f6d0be6f5f0..38b0479bb4c 100644 --- a/source/blender/blenloader/BLO_writefile.h +++ b/source/blender/blenloader/BLO_writefile.h @@ -34,8 +34,8 @@ */ struct BlendThumbnail; -struct MemFile; struct Main; +struct MemFile; struct ReportList; extern bool BLO_write_file( diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 10f0c7a2942..4120edae402 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -38,13 +38,13 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" /* for ReportType */ -struct OldNewMap; +struct Key; struct MemFile; -struct ReportList; struct Object; +struct OldNewMap; struct PartEff; +struct ReportList; struct View3D; -struct Key; typedef struct FileData { // linked list of BHeadN's diff --git a/source/blender/bmesh/bmesh_class.h b/source/blender/bmesh/bmesh_class.h index 7300615659b..01345ce836e 100644 --- a/source/blender/bmesh/bmesh_class.h +++ b/source/blender/bmesh/bmesh_class.h @@ -32,11 +32,11 @@ /* dissable holes for now, these are ifdef'd because they use more memory and cant be saved in DNA currently */ // #define USE_BMESH_HOLES -struct BMesh; -struct BMVert; struct BMEdge; -struct BMLoop; struct BMFace; +struct BMLoop; +struct BMVert; +struct BMesh; struct MLoopNorSpaceArray; diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.h b/source/blender/bmesh/intern/bmesh_edgeloop.h index 68583562888..def2256a585 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.h +++ b/source/blender/bmesh/intern/bmesh_edgeloop.h @@ -28,9 +28,9 @@ * \ingroup bmesh */ -struct ListBase; struct BMEdgeLoopStore; struct GSet; +struct ListBase; /* multiple edgeloops (ListBase) */ int BM_mesh_edgeloops_find( diff --git a/source/blender/bmesh/intern/bmesh_mesh.h b/source/blender/bmesh/intern/bmesh_mesh.h index dfd76c6b89f..472abdba88a 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.h +++ b/source/blender/bmesh/intern/bmesh_mesh.h @@ -28,8 +28,8 @@ */ struct BMAllocTemplate; -struct MLoopNorSpaceArray; struct BMLoopNorEditDataArray; +struct MLoopNorSpaceArray; void BM_mesh_elem_toolflags_ensure(BMesh *bm); void BM_mesh_elem_toolflags_clear(BMesh *bm); diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h index 8e9edfac1f9..969dce6dc86 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.h @@ -27,8 +27,8 @@ * \ingroup bmesh */ -struct BMesh; struct BMOperator; +struct BMesh; void bmo_automerge_exec(BMesh *bm, BMOperator *op); void bmo_average_vert_facedata_exec(BMesh *bm, BMOperator *op); diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index 7882542ca44..bfa07ef5c5c 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -40,10 +40,10 @@ extern "C" { #include "BLI_path_util.h" #include "RNA_types.h" -struct bContext; struct Depsgraph; struct Scene; struct ViewLayer; +struct bContext; /* * both return 1 on success, 0 on error diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 718e1cbddc4..b4a8d214c62 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -33,8 +33,8 @@ extern "C" { #define PASS_VECTOR_MAX 10000.0f /* Forward declarations */ -struct ZSpan; struct DrawBufPixel; +struct ZSpan; void zbuf_accumulate_vecblur( NodeBlurData *nbd, int xsize, int ysize, float *newrect, const float *imgrect, float *vecbufrect, const float *zbufrect); diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h index a81dd4c8852..d783e49dd29 100644 --- a/source/blender/depsgraph/DEG_depsgraph_build.h +++ b/source/blender/depsgraph/DEG_depsgraph_build.h @@ -41,8 +41,8 @@ struct Depsgraph; /* ------------------------------------------------ */ struct CacheFile; -struct EffectorWeights; struct Collection; +struct EffectorWeights; struct ID; struct Main; struct ModifierData; diff --git a/source/blender/depsgraph/DEG_depsgraph_physics.h b/source/blender/depsgraph/DEG_depsgraph_physics.h index a76134e080b..6dfd73a03c2 100644 --- a/source/blender/depsgraph/DEG_depsgraph_physics.h +++ b/source/blender/depsgraph/DEG_depsgraph_physics.h @@ -33,8 +33,8 @@ #include "DEG_depsgraph.h" struct Colllection; -struct Depsgraph; struct DepsNodeHandle; +struct Depsgraph; struct EffectorWeights; struct ListBase; struct Object; diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index 11a4ebee8c6..46a9d2c5d72 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -38,8 +38,8 @@ struct ID; -struct Base; struct BLI_Iterator; +struct Base; struct Depsgraph; struct DupliObject; struct ListBase; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 3357f6cb0a2..1db3f5d4e99 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -38,47 +38,47 @@ #include "intern/nodes/deg_node_id.h" struct Base; -struct bArmature; -struct bAction; struct CacheFile; struct Camera; -struct bGPdata; -struct ListBase; +struct Collection; +struct FCurve; struct GHash; struct ID; struct Image; -struct FCurve; -struct Collection; struct Key; struct Lamp; struct LayerCollection; struct LightProbe; +struct ListBase; +struct MTex; struct Main; -struct Material; struct Mask; -struct MTex; +struct Material; struct MovieClip; -struct bNodeTree; struct Object; struct ParticleSettings; struct Probe; -struct bPoseChannel; -struct bConstraint; struct Scene; struct Speaker; struct Tex; struct World; +struct bAction; +struct bArmature; +struct bConstraint; +struct bGPdata; +struct bNodeTree; +struct bPoseChannel; struct PropertyRNA; namespace DEG { -struct Depsgraph; +struct ComponentDepsNode; struct DepsNode; +struct Depsgraph; struct IDDepsNode; -struct TimeSourceDepsNode; -struct ComponentDepsNode; struct OperationDepsNode; +struct TimeSourceDepsNode; struct DepsgraphNodeBuilder { DepsgraphNodeBuilder(Main *bmain, Depsgraph *graph); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index c8e01476b66..55c7657dcad 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -50,53 +50,53 @@ #include "intern/nodes/deg_node_operation.h" struct Base; -struct bArmature; -struct bAction; -struct bGPdata; struct CacheFile; struct Camera; -struct ListBase; +struct Collection; +struct EffectorWeights; +struct FCurve; struct GHash; struct ID; -struct FCurve; -struct Collection; struct Key; struct Lamp; struct LayerCollection; struct LightProbe; +struct ListBase; +struct MTex; struct Main; struct Mask; struct Material; -struct MTex; struct ModifierData; struct MovieClip; -struct bNodeTree; struct Object; -struct bPoseChannel; -struct bConstraint; -struct ParticleSystem; struct ParticleSettings; +struct ParticleSystem; struct Scene; struct Speaker; -struct ViewLayer; struct Tex; +struct ViewLayer; struct World; -struct EffectorWeights; +struct bAction; +struct bArmature; +struct bConstraint; +struct bGPdata; +struct bNodeTree; +struct bPoseChannel; struct PropertyRNA; namespace DEG { -struct Depsgraph; +struct ComponentDepsNode; struct DepsNode; struct DepsNodeHandle; struct DepsRelation; -struct RootDepsNode; +struct Depsgraph; struct IDDepsNode; -struct TimeSourceDepsNode; -struct ComponentDepsNode; struct OperationDepsNode; +struct RootDepsNode; struct RootPChanMap; +struct TimeSourceDepsNode; struct TimeSourceKey { diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h index f3c4b52828f..948b200a33c 100644 --- a/source/blender/depsgraph/intern/depsgraph.h +++ b/source/blender/depsgraph/intern/depsgraph.h @@ -49,10 +49,10 @@ #include "intern/depsgraph_types.h" -struct ID; struct GHash; -struct Main; struct GSet; +struct ID; +struct Main; struct PointerRNA; struct PropertyRNA; struct Scene; @@ -60,11 +60,11 @@ struct ViewLayer; namespace DEG { +struct ComponentDepsNode; struct DepsNode; -struct TimeSourceDepsNode; struct IDDepsNode; -struct ComponentDepsNode; struct OperationDepsNode; +struct TimeSourceDepsNode; /* *************************** */ /* Relationships Between Nodes */ diff --git a/source/blender/depsgraph/intern/depsgraph_intern.h b/source/blender/depsgraph/intern/depsgraph_intern.h index 069407e855e..1f8364a5174 100644 --- a/source/blender/depsgraph/intern/depsgraph_intern.h +++ b/source/blender/depsgraph/intern/depsgraph_intern.h @@ -48,8 +48,8 @@ extern "C" { #include "DEG_depsgraph_debug.h" -struct DEGEditorUpdateContext; struct Collection; +struct DEGEditorUpdateContext; struct ListBase; struct Main; struct Scene; diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 5d51e367394..3910475f295 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -45,12 +45,12 @@ #include <vector> #include <algorithm> -struct bAction; struct ChannelDriver; +struct Depsgraph; +struct FCurve; struct ModifierData; struct PointerRNA; -struct FCurve; -struct Depsgraph; +struct bAction; namespace DEG { diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h index 7a837d17ceb..409fd83e3ac 100644 --- a/source/blender/depsgraph/intern/nodes/deg_node.h +++ b/source/blender/depsgraph/intern/nodes/deg_node.h @@ -34,14 +34,14 @@ #include "BLI_utildefines.h" -struct ID; struct GHash; +struct ID; struct Scene; namespace DEG { -struct Depsgraph; struct DepsRelation; +struct Depsgraph; struct OperationDepsNode; /* *********************************** */ diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h index 151e37f7772..5e1d97f6502 100644 --- a/source/blender/depsgraph/intern/nodes/deg_node_component.h +++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h @@ -35,16 +35,16 @@ #include "BLI_utildefines.h" #include "BLI_string.h" +struct GHash; struct ID; struct bPoseChannel; -struct GHash; namespace DEG { -struct Depsgraph; -struct OperationDepsNode; struct BoneComponentDepsNode; +struct Depsgraph; struct IDDepsNode; +struct OperationDepsNode; /* ID Component - Base type for all components */ struct ComponentDepsNode : public DepsNode { diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 3daabd11df9..3ec56a21983 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -33,28 +33,28 @@ struct ARegion; struct CollectionEngineSettings; -struct Depsgraph; -struct DRWPass; struct DRWInstanceDataList; -struct Main; -struct Material; -struct Scene; +struct DRWPass; +struct Depsgraph; struct DrawEngineType; -struct ID; -struct IDProperty; -struct bContext; -struct Object; -struct ViewLayer; -struct ViewContext; -struct ViewportEngineData; -struct View3D; -struct rcti; struct GPUMaterial; struct GPUOffScreen; struct GPUViewport; +struct ID; +struct IDProperty; +struct Main; +struct Material; +struct Object; struct RenderEngine; struct RenderEngineType; +struct Scene; +struct View3D; +struct ViewContext; +struct ViewLayer; +struct ViewportEngineData; struct WorkSpace; +struct bContext; +struct rcti; #include "DNA_object_enums.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.h b/source/blender/draw/engines/eevee/eevee_lightcache.h index 846932661be..2c570399f12 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.h +++ b/source/blender/draw/engines/eevee/eevee_lightcache.h @@ -31,13 +31,13 @@ #include "BLI_sys_types.h" /* for bool */ -struct ViewLayer; -struct Scene; -struct SceneEEVEE; -struct LightCache; -struct EEVEE_ViewLayerData; struct EEVEE_Data; struct EEVEE_LightBake; +struct EEVEE_ViewLayerData; +struct LightCache; +struct Scene; +struct SceneEEVEE; +struct ViewLayer; /* Light Bake */ struct wmJob *EEVEE_lightbake_job_create( diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index acefb6b725a..e5c29f371a8 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -31,12 +31,12 @@ #include "DNA_lightprobe_types.h" -struct Object; struct EEVEE_BoundSphere; struct EEVEE_ShadowCasterBuffer; +struct GPUFrameBuffer; +struct Object; struct RenderLayer; struct RenderResult; -struct GPUFrameBuffer; extern struct DrawEngineType draw_engine_eevee_type; diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index f6deeae062b..b8dde73accc 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -31,15 +31,15 @@ #include "GPU_batch.h" -struct tGPspoint; -struct bGPDstroke; -struct ModifierData; struct GPENCIL_Data; struct GPENCIL_StorageList; -struct Object; struct MaterialGPencilStyle; +struct ModifierData; +struct Object; struct RenderEngine; struct RenderLayer; +struct bGPDstroke; +struct tGPspoint; #define GPENCIL_CACHE_BLOCK_SIZE 8 #define GPENCIL_MAX_SHGROUPS 65536 diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 884b35c4acb..5bda5bc58b4 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -66,28 +66,28 @@ #include "DEG_depsgraph.h" -struct rcti; -struct bContext; +struct DRWTextStore; +struct DefaultFramebufferList; +struct DefaultTextureList; +struct GPUBatch; struct GPUFrameBuffer; -struct GPUShader; struct GPUMaterial; +struct GPUShader; struct GPUTexture; struct GPUUniformBuffer; -struct Object; -struct GPUBatch; -struct DefaultFramebufferList; -struct DefaultTextureList; -struct DRWTextStore; struct LampEngineData; +struct Object; struct ParticleSystem; struct RenderEngineType; struct ViewportEngineData; struct ViewportEngineData_Info; +struct bContext; +struct rcti; -typedef struct DRWUniform DRWUniform; typedef struct DRWInterface DRWInterface; typedef struct DRWPass DRWPass; typedef struct DRWShadingGroup DRWShadingGroup; +typedef struct DRWUniform DRWUniform; /* TODO Put it somewhere else? */ typedef struct BoundSphere { diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h index aec0b35c672..9328d050163 100644 --- a/source/blender/draw/intern/draw_cache_impl.h +++ b/source/blender/draw/intern/draw_cache_impl.h @@ -30,15 +30,15 @@ #define __DRAW_CACHE_IMPL_H__ struct CurveCache; -struct GPUMaterial; -struct GPUTexture; struct GPUBatch; struct GPUIndexBuf; +struct GPUMaterial; +struct GPUTexture; struct GPUVertBuf; struct ListBase; struct ModifierData; -struct ParticleSystem; struct PTCacheEdit; +struct ParticleSystem; struct SpaceImage; struct ToolSettings; diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 3beab5fe7bb..644e81e2f13 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -33,11 +33,11 @@ struct DRWPass; struct DRWShadingGroup; struct GPUBatch; struct GPUMaterial; -struct Object; -struct ViewLayer; struct ModifierData; -struct ParticleSystem; +struct Object; struct PTCacheEdit; +struct ParticleSystem; +struct ViewLayer; /** * Support selecting shaders with different options compiled in. diff --git a/source/blender/draw/intern/draw_hair_private.h b/source/blender/draw/intern/draw_hair_private.h index 41f91e02459..7fa69ee86fe 100644 --- a/source/blender/draw/intern/draw_hair_private.h +++ b/source/blender/draw/intern/draw_hair_private.h @@ -35,10 +35,10 @@ #define MAX_THICKRES 2 /* see eHairType */ #define MAX_HAIR_SUBDIV 4 /* see hair_subdiv rna */ -struct Object; -struct ParticleSystem; struct ModifierData; +struct Object; struct ParticleHairCache; +struct ParticleSystem; typedef struct ParticleHairFinalCache { /* Output of the subdivision stage: vertex buff sized to subdiv level. */ diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index 0f4fc4832b8..fd5234cbdae 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -34,19 +34,19 @@ /* internal exports only */ struct wmOperatorType; -struct bContext; -struct Scene; -struct Object; struct Base; +struct Object; +struct Scene; struct bAction; +struct bContext; struct bPoseChannel; -struct bArmature; -struct EditBone; struct Bone; +struct EditBone; +struct bArmature; -struct ListBase; struct LinkData; +struct ListBase; /* ******************************************************* */ /* Armature EditMode Operators */ diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index 6758f9d16ac..962d1a8e0db 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -29,8 +29,8 @@ //#define RIGID_DEFORM -struct Object; struct Mesh; +struct Object; struct bDeformGroup; #ifdef RIGID_DEFORM diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h index b28f546ee96..fcdce0878f9 100644 --- a/source/blender/editors/curve/curve_intern.h +++ b/source/blender/editors/curve/curve_intern.h @@ -33,12 +33,12 @@ #define __CURVE_INTERN_H__ /* internal exports only */ -struct ListBase; struct EditNurb; struct GHash; +struct ListBase; struct Object; -struct wmOperatorType; struct ViewContext; +struct wmOperatorType; /* editfont.c */ enum { DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_NEXT_WORD, DEL_PREV_WORD, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL }; diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index 8530f729889..a1146cb0777 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -38,27 +38,27 @@ /* internal exports only */ -struct bGPdata; -struct bGPDstroke; +struct Material; struct bGPDspoint; +struct bGPDstroke; +struct bGPdata; struct tGPspoint; -struct Material; struct GHash; struct RNG; +struct ARegion; struct Brush; struct Scene; -struct ARegion; -struct View3D; struct View2D; +struct View3D; struct wmOperatorType; struct Depsgraph; +struct EnumPropertyItem; struct PointerRNA; struct PropertyRNA; -struct EnumPropertyItem; /* ***************************************************** */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 863d817d19a..c8c023c6376 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -30,13 +30,13 @@ #ifndef __BIF_GLUTIL_H__ #define __BIF_GLUTIL_H__ -struct rcti; struct rctf; +struct rcti; +struct ColorManagedDisplaySettings; +struct ColorManagedViewSettings; struct ImBuf; struct bContext; -struct ColorManagedViewSettings; -struct ColorManagedDisplaySettings; /* A few functions defined here are being DEPRECATED for Blender 2.8 * diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 6e5746301be..d76559077df 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -31,27 +31,27 @@ #ifndef __ED_ANIM_API_H__ #define __ED_ANIM_API_H__ +struct AnimData; struct ID; struct ListBase; -struct AnimData; -struct bContext; +struct ARegion; struct Main; -struct wmKeyConfig; struct ReportList; struct ScrArea; struct SpaceLink; -struct ARegion; struct View2D; +struct bContext; +struct wmKeyConfig; -struct Scene; struct Object; +struct Scene; struct bDopeSheet; -struct bAction; struct FCurve; struct FModifier; +struct bAction; struct uiBlock; struct uiLayout; diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 88459da3a95..1a3306e8fe2 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -34,27 +34,27 @@ extern "C" { #endif -struct bArmature; struct Base; -struct bContext; struct Bone; -struct bPoseChannel; struct Depsgraph; struct IDProperty; struct ListBase; struct Main; -struct MeshDeformModifierData; +struct Main; struct Mesh; +struct MeshDeformModifierData; struct Object; struct ReportList; struct Scene; +struct UndoType; struct View3D; -struct ViewLayer; struct ViewContext; +struct ViewLayer; +struct bArmature; +struct bContext; +struct bPoseChannel; struct wmKeyConfig; struct wmOperator; -struct Main; -struct UndoType; typedef struct EditBone { struct EditBone *next, *prev; diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h index 4844d96e6e8..af44099bf73 100644 --- a/source/blender/editors/include/ED_clip.h +++ b/source/blender/editors/include/ED_clip.h @@ -32,14 +32,14 @@ #define __ED_CLIP_H__ struct ARegion; -struct bContext; -struct bScreen; struct ImBuf; struct Main; struct Mask; struct MovieClip; -struct SpaceClip; struct Scene; +struct SpaceClip; +struct bContext; +struct bScreen; /* ** clip_editor.c ** */ diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index e4eea9921db..d362733207d 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -31,19 +31,19 @@ #ifndef __ED_CURVE_H__ #define __ED_CURVE_H__ -struct bContext; -struct BezTriple; struct BPoint; +struct BezTriple; struct Curve; struct EditNurb; struct Main; struct Nurb; struct Object; struct Text; -struct wmOperator; -struct wmKeyConfig; struct UndoType; struct View3D; +struct bContext; +struct wmKeyConfig; +struct wmOperator; /* curve_ops.c */ void ED_operatortypes_curve(void); diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h index be772a6af98..8dc1cf9cce9 100644 --- a/source/blender/editors/include/ED_gizmo_library.h +++ b/source/blender/editors/include/ED_gizmo_library.h @@ -47,9 +47,9 @@ void ED_gizmotypes_value_2d(void); /* gizmo group types */ void ED_gizmogrouptypes_value_2d(void); -struct bContext; struct Object; struct Scene; +struct bContext; struct wmGizmo; struct wmGizmoGroup; diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h index 808e8461471..6503fd72e20 100644 --- a/source/blender/editors/include/ED_gpencil.h +++ b/source/blender/editors/include/ED_gpencil.h @@ -35,31 +35,31 @@ struct ListBase; struct PointerRNA; struct rcti; -struct bGPdata; -struct bGPDlayer; +struct Brush; struct bGPDframe; -struct bGPDstroke; +struct bGPDlayer; struct bGPDspoint; -struct Brush; +struct bGPDstroke; +struct bGPdata; -struct Main; -struct bContext; -struct EvaluationContext; -struct Depsgraph; -struct ScrArea; struct ARegion; +struct Depsgraph; +struct EvaluationContext; +struct Main; struct RegionView3D; struct ReportList; struct Scene; +struct ScrArea; struct ToolSettings; -struct ViewLayer; struct View3D; +struct ViewLayer; +struct bContext; -struct Object; struct Material; +struct Object; -struct bAnimContext; struct KeyframeEditData; +struct bAnimContext; struct wmKeyConfig; struct wmOperator; diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index f8af67b55ff..92f20d33c7b 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -30,16 +30,16 @@ #ifndef __ED_IMAGE_H__ #define __ED_IMAGE_H__ -struct SpaceImage; -struct bContext; +struct ARegion; +struct ImBuf; struct Image; struct ImageUser; -struct ImBuf; -struct ToolSettings; -struct wmWindowManager; -struct ARegion; struct Scene; +struct SpaceImage; +struct ToolSettings; struct ViewLayer; +struct bContext; +struct wmWindowManager; /* image_edit.c, exported for transform */ struct Image *ED_space_image(struct SpaceImage *sima); diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h index 9fce191561e..27e0519bab5 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.h @@ -32,21 +32,21 @@ #ifndef __ED_KEYFRAMES_DRAW_H__ #define __ED_KEYFRAMES_DRAW_H__ -struct bAnimContext; struct AnimData; struct CacheFile; +struct DLRBT_Tree; struct FCurve; -struct bDopeSheet; -struct bAction; -struct bActionGroup; -struct Object; struct ListBase; -struct bGPDlayer; -struct Palette; struct MaskLayer; +struct Object; +struct Palette; struct Scene; struct View2D; -struct DLRBT_Tree; +struct bAction; +struct bActionGroup; +struct bAnimContext; +struct bDopeSheet; +struct bGPDlayer; /* ****************************** Base Structs ****************************** */ diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index 0f477505f81..e697365be9b 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -31,12 +31,12 @@ #ifndef __ED_KEYFRAMES_EDIT_H__ #define __ED_KEYFRAMES_EDIT_H__ +struct BezTriple; +struct FCurve; +struct Scene; struct bAnimContext; struct bAnimListElem; struct bDopeSheet; -struct FCurve; -struct BezTriple; -struct Scene; /* ************************************************ */ /* Common Macros and Defines */ diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h index b1140630dc0..1240a6bbd04 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.h @@ -34,27 +34,27 @@ extern "C" { #endif -struct Main; -struct ListBase; struct ID; +struct ListBase; +struct Main; struct Scene; struct KeyingSet; -struct bAction; -struct FCurve; struct BezTriple; +struct FCurve; +struct bAction; struct bPoseChannel; -struct bContext; struct ReportList; +struct bContext; struct Depsgraph; +struct EnumPropertyItem; struct PointerRNA; struct PropertyRNA; -struct EnumPropertyItem; struct NlaKeyframingContext; @@ -133,8 +133,8 @@ short delete_keyframe( /* ************ Keying Sets ********************** */ /* forward decl. for this struct which is declared a bit later... */ -struct KeyingSetInfo; struct ExtensionRNA; +struct KeyingSetInfo; /* Polling Callback for KeyingSets */ typedef bool (*cbKeyingSet_Poll)(struct KeyingSetInfo *ksi, struct bContext *C); diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h index b30929f5307..932d55f6532 100644 --- a/source/blender/editors/include/ED_lattice.h +++ b/source/blender/editors/include/ED_lattice.h @@ -30,9 +30,9 @@ #ifndef __ED_LATTICE_H__ #define __ED_LATTICE_H__ -struct wmKeyConfig; -struct UndoType; struct Object; +struct UndoType; +struct wmKeyConfig; /* lattice_ops.c */ void ED_operatortypes_lattice(void); diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.h index fa907010870..270ec0137c0 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.h @@ -31,12 +31,12 @@ #ifndef __ED_MARKERS_H__ #define __ED_MARKERS_H__ -struct wmKeyConfig; -struct wmKeyMap; -struct bContext; -struct bAnimContext; struct Scene; struct TimeMarker; +struct bAnimContext; +struct bContext; +struct wmKeyConfig; +struct wmKeyMap; /* Drawing API ------------------------------ */ diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h index af9d87b8e0e..47d2d9e8ca1 100644 --- a/source/blender/editors/include/ED_mask.h +++ b/source/blender/editors/include/ED_mask.h @@ -31,11 +31,11 @@ #ifndef __ED_MASK_H__ #define __ED_MASK_H__ -struct bContext; -struct wmKeyConfig; +struct KeyframeEditData; struct MaskLayer; struct MaskLayerShape; -struct KeyframeEditData; +struct bContext; +struct wmKeyConfig; /* mask_edit.c */ void ED_mask_get_size(struct ScrArea *sa, int *width, int *height); diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.h index 47ea3929883..69918632220 100644 --- a/source/blender/editors/include/ED_mball.h +++ b/source/blender/editors/include/ED_mball.h @@ -31,10 +31,10 @@ #ifndef __ED_MBALL_H__ #define __ED_MBALL_H__ -struct bContext; struct Object; -struct wmKeyConfig; struct UndoType; +struct bContext; +struct wmKeyConfig; void ED_operatortypes_metaball(void); void ED_operatormacros_metaball(void); diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index a2f034589f6..04a0cd5d1df 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -35,36 +35,36 @@ extern "C" { #endif -struct Base; -struct ID; -struct View3D; struct ARegion; -struct bContext; +struct BMBVHTree; +struct BMEdge; +struct BMEditMesh; +struct BMElem; +struct BMFace; +struct BMLoop; +struct BMVert; +struct BMesh; +struct Base; struct Depsgraph; -struct wmOperator; -struct wmKeyConfig; -struct ReportList; -struct ViewContext; -struct bDeformGroup; +struct ID; struct MDeformVert; -struct Scene; struct Mesh; -struct UvVertMap; +struct Object; +struct ReportList; +struct Scene; +struct ToolSettings; +struct UndoType; struct UvMapVert; -struct BMEditMesh; -struct BMElem; -struct BMesh; -struct BMVert; -struct BMLoop; -struct BMBVHTree; -struct BMEdge; -struct BMFace; -struct UvVertMap; struct UvMapVert; -struct ToolSettings; -struct Object; +struct UvVertMap; +struct UvVertMap; +struct View3D; +struct ViewContext; +struct bContext; +struct bDeformGroup; struct rcti; -struct UndoType; +struct wmKeyConfig; +struct wmOperator; /* editmesh_utils.c */ void EDBM_verts_mirror_cache_begin_ex(struct BMEditMesh *em, const int axis, diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h index e3a62f871a2..eaddf46dbc4 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node.h @@ -34,17 +34,17 @@ struct ID; struct Main; struct Scene; +struct Scene; +struct ScrArea; struct Tex; +struct View2D; struct bContext; -struct bNodeTree; struct bNode; -struct bNodeType; struct bNodeSocketType; struct bNodeTree; +struct bNodeTree; struct bNodeTreeType; -struct ScrArea; -struct Scene; -struct View2D; +struct bNodeType; typedef enum { NODE_TOP = 1, diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 5a02bc2310a..ebf28612448 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -35,33 +35,33 @@ extern "C" { #endif -struct bFaceMap; struct Base; +struct Depsgraph; +struct EnumPropertyItem; struct EnumPropertyItem; struct ID; struct Main; struct Menu; struct ModifierData; -struct ShaderFxData; struct Object; +struct PointerRNA; +struct PropertyRNA; struct ReportList; struct Scene; +struct ShaderFxData; struct View3D; struct ViewLayer; struct bConstraint; struct bContext; +struct bFaceMap; struct bPoseChannel; +struct uiLayout; struct wmKeyConfig; struct wmKeyMap; struct wmOperator; struct wmOperatorType; struct wmWindow; struct wmWindowManager; -struct PointerRNA; -struct PropertyRNA; -struct EnumPropertyItem; -struct Depsgraph; -struct uiLayout; #include "DNA_object_enums.h" #include "BLI_compiler_attrs.h" diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h index 52fdeb2045c..8a4790feec0 100644 --- a/source/blender/editors/include/ED_outliner.h +++ b/source/blender/editors/include/ED_outliner.h @@ -27,8 +27,8 @@ #ifndef __ED_OUTLINER_H__ #define __ED_OUTLINER_H__ -struct bContext; struct ListBase; +struct bContext; bool ED_outliner_collections_editor_poll(struct bContext *C); diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.h index 246419d64aa..b0e12c4b5ed 100644 --- a/source/blender/editors/include/ED_paint.h +++ b/source/blender/editors/include/ED_paint.h @@ -25,13 +25,13 @@ #ifndef __ED_PAINT_H__ #define __ED_PAINT_H__ -struct bContext; -struct wmKeyConfig; -struct wmOperator; struct ImBuf; struct Image; struct UndoStep; struct UndoType; +struct bContext; +struct wmKeyConfig; +struct wmOperator; /* paint_ops.c */ void ED_operatortypes_paint(void); diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.h index 7e7198a8ace..c58fe744500 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.h @@ -32,15 +32,15 @@ #ifndef __ED_PARTICLE_H__ #define __ED_PARTICLE_H__ -struct bContext; struct Object; -struct ParticleSystem; -struct ParticleEditSettings; -struct rcti; struct PTCacheEdit; +struct ParticleEditSettings; +struct ParticleSystem; struct Scene; -struct ViewLayer; struct UndoType; +struct ViewLayer; +struct bContext; +struct rcti; /* particle edit mode */ void PE_free_ptcache_edit(struct PTCacheEdit *edit); diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.h index 32444beb0fe..9488bc91abd 100644 --- a/source/blender/editors/include/ED_physics.h +++ b/source/blender/editors/include/ED_physics.h @@ -32,12 +32,12 @@ #ifndef __ED_PHYSICS_H__ #define __ED_PHYSICS_H__ -struct bContext; struct ReportList; +struct bContext; struct wmKeyConfig; -struct Scene; struct Object; +struct Scene; /* particle_edit.c */ bool PE_poll(struct bContext *C); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 2615847e90a..fb11c187068 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -30,14 +30,14 @@ #include "DNA_vec_types.h" -struct bContext; struct DEGEditorUpdateContext; struct ID; -struct Main; struct MTex; +struct Main; struct Render; struct Scene; struct ScrArea; +struct bContext; struct wmWindowManager; /* render_ops.c */ diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 9ad4c06dee6..166a3202542 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -41,29 +41,29 @@ #include "BLI_compiler_attrs.h" +struct ARegion; struct Depsgraph; -struct wmWindowManager; -struct wmWindow; -struct wmNotifier; -struct wmEvent; -struct wmKeyConfig; +struct IDProperty; +struct Main; +struct MenuType; +struct PropertyRNA; +struct Scene; +struct ViewLayer; struct WorkSpace; struct WorkSpaceInstanceHook; struct bContext; -struct Scene; -struct ViewLayer; struct bScreen; -struct ARegion; -struct uiBlock; struct rcti; -struct Main; +struct uiBlock; +struct wmEvent; +struct wmKeyConfig; struct wmMsgBus; struct wmMsgSubscribeKey; struct wmMsgSubscribeValue; +struct wmNotifier; struct wmOperatorType; -struct IDProperty; -struct MenuType; -struct PropertyRNA; +struct wmWindow; +struct wmWindowManager; /* regions */ void ED_region_do_listen( diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.h index 94508a98dcb..7b8ee75fd90 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.h @@ -31,14 +31,14 @@ #define __ED_SCULPT_H__ struct ARegion; -struct bContext; +struct ListBase; struct Object; struct RegionView3D; -struct ViewContext; -struct rcti; struct UndoStep; struct UndoType; -struct ListBase; +struct ViewContext; +struct bContext; +struct rcti; /* sculpt.c */ void ED_operatortypes_sculpt(void); diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.h index 18446966c4f..8338e86a246 100644 --- a/source/blender/editors/include/ED_sequencer.h +++ b/source/blender/editors/include/ED_sequencer.h @@ -27,10 +27,10 @@ #ifndef __ED_SEQUENCER_H__ #define __ED_SEQUENCER_H__ -struct bContext; struct Scene; struct Sequence; struct SpaceSeq; +struct bContext; void ED_sequencer_select_sequence_single(struct Scene *scene, struct Sequence *seq, bool deselect_all); void ED_sequencer_deselect_all(struct Scene *scene); diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.h index 858902eeec1..ead56f777d9 100644 --- a/source/blender/editors/include/ED_text.h +++ b/source/blender/editors/include/ED_text.h @@ -30,10 +30,10 @@ #ifndef __ED_TEXT_H__ #define __ED_TEXT_H__ -struct SpaceText; struct ARegion; -struct UndoType; +struct SpaceText; struct TextUndoBuf; +struct UndoType; bool ED_text_region_location_from_cursor(struct SpaceText *st, struct ARegion *ar, const int cursor_co[2], int r_pixel_co[2]); diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h index ad39c1ccc8a..7a819a612eb 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.h @@ -36,17 +36,17 @@ struct ARegion; struct ListBase; +struct Main; struct Object; +struct SnapObjectContext; +struct SnapObjectParams; struct View3D; +struct WorkSpace; struct bContext; struct wmEvent; struct wmKeyConfig; struct wmKeyMap; struct wmOperatorType; -struct WorkSpace; -struct Main; -struct SnapObjectContext; -struct SnapObjectParams; void ED_keymap_transform(struct wmKeyConfig *keyconf); void transform_operatortypes(void); @@ -111,9 +111,9 @@ enum TfmMode { * */ bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]); -struct TransInfo; -struct Scene; struct Object; +struct Scene; +struct TransInfo; struct wmGizmoGroup; struct wmGizmoGroupType; struct wmOperator; @@ -121,9 +121,9 @@ struct wmOperator; /* UNUSED */ // int BIF_snappingSupported(struct Object *obedit); +struct ReportList; struct TransformOrientation; struct bContext; -struct ReportList; void BIF_clearTransformOrientation(struct bContext *C); void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts); diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.h index 8ac7dfcf9d8..6f143393432 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.h @@ -25,18 +25,18 @@ #ifndef __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ #define __ED_TRANSFORM_SNAP_OBJECT_CONTEXT_H__ -struct BMVert; struct BMEdge; struct BMFace; +struct BMVert; +struct ARegion; struct Depsgraph; struct ListBase; -struct Scene; -struct ViewLayer; struct Main; struct Object; -struct ARegion; +struct Scene; struct View3D; +struct ViewLayer; struct bContext; /* transform_snap_object.c */ diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.h index 677d64acc7d..71e36892aa4 100644 --- a/source/blender/editors/include/ED_undo.h +++ b/source/blender/editors/include/ED_undo.h @@ -27,11 +27,11 @@ #include "BLI_compiler_attrs.h" -struct bContext; struct CLG_LogRef; +struct UndoStack; +struct bContext; struct wmOperator; struct wmOperatorType; -struct UndoStack; /* undo.c */ void ED_undo_push(struct bContext *C, const char *str); diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index e4d70a99e98..390398262f9 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -33,9 +33,9 @@ #include "BLI_compiler_attrs.h" +struct Main; struct bContext; struct wmOperatorType; -struct Main; /* ed_util.c */ void ED_editors_init(struct bContext *C); diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index b17fea2b299..6b59b40ede1 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -31,19 +31,19 @@ #define __ED_UVEDIT_H__ struct ARegionType; -struct BMesh; struct BMEditMesh; struct BMFace; struct BMLoop; +struct BMesh; struct Depsgraph; struct Image; struct ImageUser; struct Main; struct Object; struct Scene; +struct SpaceImage; struct View3D; struct ViewLayer; -struct SpaceImage; struct bNode; struct wmKeyConfig; diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 8a699d8c9fb..5f39d722da3 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -43,6 +43,10 @@ struct BoundBox; struct Camera; struct Depsgraph; struct EditBone; +struct GPUFX; +struct GPUFXSettings; +struct GPUOffScreen; +struct GPUViewport; struct ImBuf; struct MVert; struct Main; @@ -53,10 +57,11 @@ struct RV3DMatrixStore; struct RegionView3D; struct RenderEngineType; struct Scene; -struct ViewLayer; struct ScrArea; struct View3D; struct ViewContext; +struct ViewLayer; +struct WorkSpace; struct bContext; struct bPoseChannel; struct bScreen; @@ -66,11 +71,6 @@ struct wmOperator; struct wmOperatorType; struct wmWindow; struct wmWindowManager; -struct GPUFX; -struct GPUOffScreen; -struct GPUFXSettings; -struct GPUViewport; -struct WorkSpace; enum eGPUFXFlags; /* for derivedmesh drawing callbacks, for view3d_select, .... */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 1db42ec0a53..38d88881f73 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -38,50 +38,50 @@ /* Struct Declarations */ -struct ID; -struct IDProperty; -struct ListBase; struct ARegion; struct ARegionType; -struct ScrArea; -struct bScreen; -struct wmEvent; -struct wmWindow; -struct wmOperator; struct AutoComplete; -struct bContext; -struct bContextStore; +struct ID; +struct IDProperty; +struct ImBuf; +struct Image; +struct ImageUser; +struct ListBase; +struct MTex; struct Panel; struct PanelType; struct PointerRNA; struct PropertyRNA; struct ReportList; +struct ScrArea; +struct bContext; +struct bContextStore; +struct bNode; +struct bNodeSocket; +struct bNodeTree; +struct bScreen; struct rcti; +struct uiFontStyle; struct uiList; struct uiStyle; -struct uiFontStyle; struct uiWidgetColors; -struct Image; -struct ImageUser; -struct wmKeyConfig; -struct wmOperatorType; -struct MTex; -struct ImBuf; -struct bNodeTree; -struct bNode; -struct bNodeSocket; -struct wmDropBox; struct wmDrag; +struct wmDropBox; +struct wmEvent; struct wmEvent; struct wmGizmo; -struct wmMsgBus; +struct wmKeyConfig; struct wmKeyMap; struct wmKeyMapItem; +struct wmMsgBus; +struct wmOperator; +struct wmOperatorType; +struct wmWindow; -typedef struct uiBut uiBut; typedef struct uiBlock uiBlock; -typedef struct uiPopupBlockHandle uiPopupBlockHandle; +typedef struct uiBut uiBut; typedef struct uiLayout uiLayout; +typedef struct uiPopupBlockHandle uiPopupBlockHandle; /* Defines */ diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 640d66c9ac4..16b3f67bb73 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -32,11 +32,11 @@ #ifndef __UI_INTERFACE_ICONS_H__ #define __UI_INTERFACE_ICONS_H__ -struct bContext; struct ID; -struct Scene; -struct PreviewImage; struct PointerRNA; +struct PreviewImage; +struct Scene; +struct bContext; enum eIconSizes; diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h index f35976750c9..eb29efb6a07 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.h @@ -134,13 +134,13 @@ struct View2D; struct View2DGrid; struct View2DScrollers; -struct wmKeyConfig; -struct bScreen; +struct ARegion; struct Scene; struct ScrArea; -struct ARegion; struct bContext; +struct bScreen; struct rctf; +struct wmKeyConfig; typedef struct View2DGrid View2DGrid; typedef struct View2DScrollers View2DScrollers; diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index c5315518ec7..7720a3283d6 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -39,19 +39,19 @@ #include "DNA_listBase.h" struct ARegion; +struct ID; +struct ImBuf; +struct Scene; struct bContext; +struct bContextStore; struct uiHandleButtonData; +struct uiLayout; +struct uiStyle; +struct uiWidgetColors; struct wmEvent; struct wmKeyConfig; struct wmOperatorType; struct wmTimer; -struct uiStyle; -struct uiWidgetColors; -struct uiLayout; -struct bContextStore; -struct Scene; -struct ID; -struct ImBuf; /* ****************** general defines ************** */ diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h index 60acb430b20..99b4a8b42d4 100644 --- a/source/blender/editors/mask/mask_intern.h +++ b/source/blender/editors/mask/mask_intern.h @@ -32,8 +32,8 @@ #ifndef __MASK_INTERN_H__ #define __MASK_INTERN_H__ -struct bContext; struct Mask; +struct bContext; struct wmOperatorType; /* internal exports only */ diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index ab0b6e19575..b87340f1486 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -35,15 +35,15 @@ #define __MESH_INTERN_H__ struct BMEditMesh; -struct BMOperator; struct BMElem; +struct BMOperator; struct EnumPropertyItem; +struct LinkNode; struct bContext; struct wmKeyConfig; struct wmKeyMap; struct wmOperator; struct wmOperatorType; -struct LinkNode; /* *** editmesh_utils.c *** */ diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index e4953202ee4..1ef0b0f268c 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -31,11 +31,11 @@ #ifndef __OBJECT_INTERN_H__ #define __OBJECT_INTERN_H__ -struct wmOperatorType; struct Object; -struct bContext; struct StructRNA; +struct bContext; struct wmOperator; +struct wmOperatorType; struct ModifierData; diff --git a/source/blender/editors/render/render_intern.h b/source/blender/editors/render/render_intern.h index 585a7999290..7e73884c5be 100644 --- a/source/blender/editors/render/render_intern.h +++ b/source/blender/editors/render/render_intern.h @@ -32,10 +32,10 @@ #ifndef __RENDER_INTERN_H__ #define __RENDER_INTERN_H__ -struct bContext; struct RenderEngine; -struct wmOperatorType; struct ScrArea; +struct bContext; +struct wmOperatorType; /* render_shading.c */ void OBJECT_OT_material_slot_add(struct wmOperatorType *ot); diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index 4c7d859e4ee..9299d401651 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -31,9 +31,9 @@ #ifndef __SCREEN_INTERN_H__ #define __SCREEN_INTERN_H__ +struct Main; struct bContext; struct bContextDataResult; -struct Main; /* internal exports only */ diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 4bfdf39621e..b5993c1f243 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -33,28 +33,28 @@ #define __PAINT_INTERN_H__ struct ARegion; -struct bContext; struct Brush; -struct ImagePool; -struct ColorSpace; struct ColorManagedDisplay; +struct ColorSpace; +struct ImagePool; struct ListBase; struct MTex; struct Object; -struct PaintStroke; struct Paint; struct PaintCurve; +struct PaintStroke; struct PointerRNA; -struct rcti; -struct Scene; struct RegionView3D; +struct Scene; +struct UndoStep; struct VPaint; struct ViewContext; +struct bContext; +struct rcti; struct wmEvent; struct wmOperator; struct wmOperatorType; struct wmWindowManager; -struct UndoStep; enum ePaintMode; typedef struct CoNo { diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 4e2ecc210f4..2d530d2ef5f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -42,11 +42,11 @@ #include "BKE_pbvh.h" -struct bContext; struct KeyBlock; struct Object; -struct SculptUndoNode; struct SculptOrigVertData; +struct SculptUndoNode; +struct bContext; bool sculpt_mode_poll(struct bContext *C); bool sculpt_mode_poll_view3d(struct bContext *C); diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 986afe96e11..a895f28985b 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -31,15 +31,15 @@ #ifndef __ACTION_INTERN_H__ #define __ACTION_INTERN_H__ -struct bContext; -struct bAnimContext; -struct Scene; -struct Object; -struct SpaceAction; -struct ScrArea; struct ARegion; struct ARegionType; +struct Object; +struct Scene; +struct ScrArea; +struct SpaceAction; struct View2D; +struct bAnimContext; +struct bContext; struct wmOperatorType; /* internal exports only */ diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index e8488a5d0b6..7489ca9022e 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -32,7 +32,6 @@ #ifndef __CLIP_INTERN_H__ #define __CLIP_INTERN_H__ -struct bContext; struct ARegion; struct MovieClip; struct MovieTrackingMarker; @@ -40,6 +39,7 @@ struct MovieTrackingTrack; struct Scene; struct ScrArea; struct SpaceClip; +struct bContext; struct wmOperatorType; /* channel heights */ diff --git a/source/blender/editors/space_clip/tracking_ops_intern.h b/source/blender/editors/space_clip/tracking_ops_intern.h index b53799b88d8..6cb2c97325a 100644 --- a/source/blender/editors/space_clip/tracking_ops_intern.h +++ b/source/blender/editors/space_clip/tracking_ops_intern.h @@ -32,10 +32,10 @@ #ifndef __TRACKING_OPS_INTERN_H__ #define __TRACKING_OPS_INTERN_H__ -struct bContext; struct ListBase; struct MovieClip; struct SpaceClip; +struct bContext; /* tracking_utils.c */ diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h index a272464e0d9..ca2e7679212 100644 --- a/source/blender/editors/space_console/console_intern.h +++ b/source/blender/editors/space_console/console_intern.h @@ -30,8 +30,8 @@ /* internal exports only */ struct ConsoleLine; -struct wmOperatorType; struct bContext; +struct wmOperatorType; /* console_draw.c */ void console_textview_main(struct SpaceConsole *sc, struct ARegion *ar); diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 710aa472a8b..77b13a0dbef 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -59,8 +59,8 @@ void file_draw_check_cb(bContext *C, void *arg1, void *arg2); bool file_draw_check_exists(SpaceFile *sfile); /* file_ops.h */ -struct wmOperatorType; struct wmOperator; +struct wmOperatorType; typedef enum WalkSelectDirection { FILE_SELECT_WALK_UP, diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index 286d3cea59c..f9a39df0a89 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -31,14 +31,14 @@ #ifndef __GRAPH_INTERN_H__ #define __GRAPH_INTERN_H__ -struct bContext; -struct bAnimContext; -struct bAnimListElem; -struct SpaceIpo; -struct ScrArea; struct ARegion; struct ARegionType; +struct ScrArea; +struct SpaceIpo; struct View2DGrid; +struct bAnimContext; +struct bAnimListElem; +struct bContext; /* internal exports only */ diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index db223d7f7a1..55f6f1e03c9 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -33,13 +33,13 @@ #define __IMAGE_INTERN_H__ /* internal exports only */ -struct bContext; struct ARegion; struct ARegionType; struct ScrArea; struct SpaceImage; -struct wmOperatorType; +struct bContext; struct bNodeTree; +struct wmOperatorType; /* space_image.c */ struct ARegion *image_has_buttons_region(struct ScrArea *sa); diff --git a/source/blender/editors/space_info/info_intern.h b/source/blender/editors/space_info/info_intern.h index 37d3c73f705..4fb564c3da6 100644 --- a/source/blender/editors/space_info/info_intern.h +++ b/source/blender/editors/space_info/info_intern.h @@ -33,9 +33,9 @@ /* internal exports only */ +struct ReportList; struct SpaceInfo; struct wmOperatorType; -struct ReportList; void FILE_OT_autopack_toggle(struct wmOperatorType *ot); void FILE_OT_pack_all(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index a74daae12b3..4e30bae7ad6 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -39,14 +39,14 @@ struct ARegion; struct ARegionType; +struct Main; struct View2D; struct bContext; -struct Main; -struct wmWindow; struct bNode; -struct bNodeSocket; struct bNodeLink; +struct bNodeSocket; struct wmKeyConfig; +struct wmWindow; /* temp data to pass on to modal */ typedef struct bNodeLinkDrag { diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index b3e4ea88b4c..194e79f4ac2 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -37,20 +37,20 @@ /* internal exports only */ struct ARegion; +struct EditBone; +struct ID; struct ListBase; -struct wmOperatorType; -struct TreeElement; -struct TreeStoreElem; struct Main; -struct bContext; +struct Object; struct Scene; +struct TreeElement; +struct TreeStoreElem; struct ViewLayer; -struct ID; -struct Object; +struct bContext; struct bPoseChannel; -struct EditBone; struct wmEvent; struct wmKeyConfig; +struct wmOperatorType; typedef enum TreeElementInsertType { TE_INSERT_BEFORE, diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 0d647c883be..69a33573f19 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -36,18 +36,18 @@ /* internal exports only */ +struct ARegion; +struct ARegionType; struct Depsgraph; +struct Main; +struct Scene; +struct ScrArea; struct Sequence; +struct SpaceSeq; +struct StripElem; struct bContext; struct rctf; -struct SpaceSeq; -struct ScrArea; -struct ARegion; -struct ARegionType; -struct Scene; -struct Main; struct wmOperator; -struct StripElem; /* space_sequencer.c */ struct ARegion *sequencer_has_buttons_region(struct ScrArea *sa); @@ -87,8 +87,8 @@ extern EnumPropertyItem sequencer_prop_effect_types[]; extern EnumPropertyItem prop_side_types[]; /* operators */ -struct wmOperatorType; struct wmKeyConfig; +struct wmOperatorType; void SEQUENCER_OT_cut(struct wmOperatorType *ot); void SEQUENCER_OT_slip(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 02948d35623..b22ec86b444 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -34,11 +34,11 @@ /* internal exports only */ struct ARegion; -struct bContext; struct ScrArea; struct SpaceText; struct Text; struct TextLine; +struct bContext; struct wmOperatorType; /* text_draw.c */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index c84bd039012..ad12ace591e 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -39,20 +39,20 @@ struct ARegion; struct ARegionType; struct Base; struct BoundBox; -struct GPUBatch; struct Depsgraph; +struct GPUBatch; +struct Mesh; struct Object; struct SmokeDomainSettings; +struct ViewLayer; struct bAnimVizSettings; struct bContext; struct bMotionPath; struct bPoseChannel; -struct Mesh; -struct ViewLayer; -struct wmOperatorType; -struct wmKeyConfig; struct wmGizmoGroupType; struct wmGizmoType; +struct wmKeyConfig; +struct wmOperatorType; struct wmWindowManager; /* drawing flags: */ diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index cd5c7e31efd..360fb4fad25 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -45,30 +45,30 @@ /* ************************** Types ***************************** */ +struct ARegion; struct Depsgraph; -struct TransInfo; -struct TransDataContainer; -struct TransData; -struct TransformOrientation; -struct TransSnap; +struct EditBone; struct NumInput; struct Object; -struct View3D; -struct ScrArea; +struct RNG; +struct RenderEngineType; +struct ReportList; struct Scene; +struct ScrArea; +struct SnapObjectContext; +struct TransData; +struct TransDataContainer; +struct TransInfo; +struct TransSnap; +struct TransformOrientation; +struct View3D; struct ViewLayer; struct bConstraint; -struct wmKeyMap; -struct wmKeyConfig; struct bContext; struct wmEvent; +struct wmKeyConfig; +struct wmKeyMap; struct wmTimer; -struct ARegion; -struct ReportList; -struct RNG; -struct EditBone; -struct RenderEngineType; -struct SnapObjectContext; #include "DNA_object_enums.h" @@ -261,8 +261,8 @@ typedef struct TransDataNla { int handle; } TransDataNla; -struct LinkNode; struct GHash; +struct LinkNode; /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */ typedef struct TransDataGenericSlideVert { diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index 34cd885d75e..adb12239371 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -32,14 +32,14 @@ #ifndef __UVEDIT_INTERN_H__ #define __UVEDIT_INTERN_H__ +struct BMEditMesh; +struct BMFace; +struct BMLoop; struct Image; struct Object; struct Scene; struct SpaceImage; struct wmOperatorType; -struct BMEditMesh; -struct BMFace; -struct BMLoop; /* geometric utilities */ void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy, int len); diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 7d0439d9b66..c58621690a8 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -91,11 +91,11 @@ typedef struct PHash { -struct PVert; +struct PChart; struct PEdge; struct PFace; -struct PChart; struct PHandle; +struct PVert; /* Simplices */ diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 5757fcc9294..017e73b3b14 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -29,11 +29,11 @@ extern "C" { #endif -struct Render; -struct RenderLayer; -struct Material; struct FreestyleConfig; struct FreestyleLineStyle; +struct Material; +struct Render; +struct RenderLayer; struct FreestyleGlobals { struct Scene *scene; diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h index 480c431b8b4..8bf94620c7c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h @@ -33,13 +33,13 @@ #ifndef __MOD_GPENCIL_UTIL_H__ #define __MOD_GPENCIL_UTIL_H__ +struct GHash; +struct MDeformVert; struct Main; +struct Material; struct Object; struct bGPDlayer; struct bGPDstroke; -struct MDeformVert; -struct Material; -struct GHash; bool is_stroke_affected_by_modifier( struct Object *ob, char *mlayername, int mpassindex, diff --git a/source/blender/gpu/GPU_batch_presets.h b/source/blender/gpu/GPU_batch_presets.h index 30b1574e19c..ce333f8980a 100644 --- a/source/blender/gpu/GPU_batch_presets.h +++ b/source/blender/gpu/GPU_batch_presets.h @@ -34,8 +34,8 @@ #ifndef __GPU_BATCH_PRESETS_H__ #define __GPU_BATCH_PRESETS_H__ -struct rctf; struct GPUVertFormat; +struct rctf; #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h index 4b94b79022b..17fbebdcfc9 100644 --- a/source/blender/gpu/GPU_draw.h +++ b/source/blender/gpu/GPU_draw.h @@ -36,17 +36,17 @@ extern "C" { #endif +struct DupliObject; struct ImBuf; struct Image; struct ImageUser; struct Main; struct Object; -struct Scene; -struct ViewLayer; -struct View3D; struct RegionView3D; +struct Scene; struct SmokeModifierData; -struct DupliObject; +struct View3D; +struct ViewLayer; #include "DNA_object_enums.h" diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index fee5b820256..58dec24bea8 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -41,28 +41,28 @@ extern "C" { #endif +struct GPUMaterial; +struct GPUNode; +struct GPUNodeLink; +struct GPUNodeStack; +struct GPUTexture; +struct GPUUniformBuffer; +struct GPUVertexAttribs; struct Image; struct ImageUser; struct ListBase; struct Main; struct Material; struct Object; -struct Scene; -struct GPUVertexAttribs; -struct GPUNode; -struct GPUNodeLink; -struct GPUNodeStack; -struct GPUMaterial; -struct GPUTexture; -struct GPUUniformBuffer; struct PreviewImage; +struct Scene; struct World; struct bNode; struct bNodeTree; +typedef struct GPUMaterial GPUMaterial; typedef struct GPUNode GPUNode; typedef struct GPUNodeLink GPUNodeLink; -typedef struct GPUMaterial GPUMaterial; typedef struct GPUParticleInfo GPUParticleInfo; diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 828673390a4..e8cc35a128a 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -38,10 +38,10 @@ extern "C" { #endif +struct GPUVertBuf; struct Image; struct ImageUser; struct PreviewImage; -struct GPUVertBuf; struct GPUFrameBuffer; typedef struct GPUTexture GPUTexture; diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index 93eb84b7766..2325fb564ab 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -38,11 +38,11 @@ #include "GPU_material.h" #include "GPU_glew.h" -struct ListBase; -struct GPUShader; -struct GPUOutput; struct GPUNode; +struct GPUOutput; +struct GPUShader; struct GPUVertexAttribs; +struct ListBase; struct PreviewImage; /* Pass Generation diff --git a/source/blender/ikplugin/BIK_api.h b/source/blender/ikplugin/BIK_api.h index 07a223b738e..2e92773eec7 100644 --- a/source/blender/ikplugin/BIK_api.h +++ b/source/blender/ikplugin/BIK_api.h @@ -38,12 +38,12 @@ extern "C" { #endif +struct Depsgraph; struct Object; -struct bPoseChannel; -struct bPose; struct Scene; struct bConstraint; -struct Depsgraph; +struct bPose; +struct bPoseChannel; enum BIK_ParamType { BIK_PARAM_TYPE_FLOAT = 0, diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 437a699208b..8d4679699d0 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -41,18 +41,18 @@ #define BCM_CONFIG_FILE "config.ocio" -struct bContext; struct ColorManagedColorspaceSettings; struct ColorManagedDisplaySettings; struct ColorManagedViewSettings; struct ColormanageProcessor; struct EnumPropertyItem; struct ImBuf; -struct Main; struct ImageFormatData; +struct Main; +struct bContext; -struct ColorSpace; struct ColorManagedDisplay; +struct ColorSpace; /* ** Generic functions ** */ diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h index 0321d5ef0fb..579e2bfb519 100644 --- a/source/blender/imbuf/IMB_metadata.h +++ b/source/blender/imbuf/IMB_metadata.h @@ -33,9 +33,9 @@ #ifndef __IMB_METADATA_H__ #define __IMB_METADATA_H__ -struct anim; -struct ImBuf; struct IDProperty; +struct ImBuf; +struct anim; /** The metadata is a list of key/value pairs (both char *) that can me * saved in the header of several image formats. diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index 0328bbe6609..978df1ddefe 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -90,9 +90,9 @@ #define MAXNUMSTREAMS 50 +struct IDProperty; struct _AviMovie; struct anim_index; -struct IDProperty; struct anim { int ib_flags; diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h index ee3d207a8db..cf2940721c2 100644 --- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h +++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h @@ -38,8 +38,8 @@ #include "DNA_listBase.h" #include "BLI_sys_types.h" -struct OCIO_ConstProcessorRcPtr; struct ImBuf; +struct OCIO_ConstProcessorRcPtr; extern float imbuf_luma_coefficients[3]; extern float imbuf_xyz_to_rgb[3][3]; diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index ba8365993c8..46dd67e9d06 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -39,11 +39,11 @@ extern "C" { #endif -struct Library; struct FileData; +struct GPUTexture; struct ID; +struct Library; struct PackedFile; -struct GPUTexture; /* Runtime display data */ struct DrawData; diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 807dbe5be25..a756ab29c48 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -41,10 +41,10 @@ #include "DNA_view2d_types.h" #include "DNA_userdef_types.h" /* ThemeWireColor */ -struct SpaceLink; -struct Object; struct Collection; struct GHash; +struct Object; +struct SpaceLink; /* ************************************************ */ /* Visualization */ @@ -221,8 +221,8 @@ typedef struct bPoseChannelDrawData { float bbone_matrix[0][4][4]; } bPoseChannelDrawData; -struct Mat4; struct DualQuat; +struct Mat4; typedef struct bPoseChannelRuntime { int bbone_segments; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index a2721526cf5..ea80a1e1091 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -42,8 +42,8 @@ //#endif struct CurveMapping; -struct MTex; struct Image; +struct MTex; struct Material; typedef struct BrushClone { diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index bb80724c01a..f3cf5680f42 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -42,9 +42,9 @@ extern "C" { #endif -struct Object; struct AnimData; struct Ipo; +struct Object; /* ------------------------------------------- */ /* Stereo Settings */ diff --git a/source/blender/makesdna/DNA_collection_types.h b/source/blender/makesdna/DNA_collection_types.h index 69843f4a4b6..104c296ae62 100644 --- a/source/blender/makesdna/DNA_collection_types.h +++ b/source/blender/makesdna/DNA_collection_types.h @@ -38,8 +38,8 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -struct Object; struct Collection; +struct Object; typedef struct CollectionObject { struct CollectionObject *next, *prev; diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index c8e55cc15a1..7e1be67dbb6 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -38,8 +38,8 @@ #include "DNA_listBase.h" struct Action; -struct Text; struct Ipo; +struct Text; /* channels reside in Object or Action (ListBase) constraintChannels */ // XXX deprecated... old AnimSys diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 9c6b68b865a..2fe67260dbc 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -39,15 +39,15 @@ #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ +struct AnimData; struct BoundBox; -struct Object; +struct EditFont; +struct GHash; struct Ipo; struct Key; struct Material; +struct Object; struct VFont; -struct AnimData; -struct EditFont; -struct GHash; /* These two Lines with # tell makesdna this struct can be excluded. */ # diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h index 9d7685355d9..2bd220ef7cd 100644 --- a/source/blender/makesdna/DNA_freestyle_types.h +++ b/source/blender/makesdna/DNA_freestyle_types.h @@ -39,8 +39,8 @@ extern "C" { #endif -struct FreestyleLineStyle; struct Collection; +struct FreestyleLineStyle; struct Text; /* FreestyleConfig::flags */ diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 8bca051739d..4af6afcb17a 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -36,12 +36,12 @@ #include "DNA_ID.h" #include "DNA_color_types.h" /* for color management */ +struct GPUTexture; +struct MovieCache; struct PackedFile; +struct RenderResult; struct Scene; struct anim; -struct MovieCache; -struct RenderResult; -struct GPUTexture; /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */ /* should be used in conjunction with an ID * to Image. */ diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index 566afaa1548..4bc47ee99ff 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -40,10 +40,10 @@ #endif struct AnimData; -struct bNodeTree; struct CurveMapping; struct Ipo; struct MTex; +struct bNodeTree; typedef struct Lamp { ID id; diff --git a/source/blender/makesdna/DNA_lightprobe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h index a6182931b2d..158fae99f43 100644 --- a/source/blender/makesdna/DNA_lightprobe_types.h +++ b/source/blender/makesdna/DNA_lightprobe_types.h @@ -36,8 +36,8 @@ extern "C" { #endif -struct Object; struct AnimData; +struct Object; typedef struct LightProbe { ID id; diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index bd81d170e8e..447c65bfabe 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -40,10 +40,10 @@ #define MAX_MTEX 18 #endif -struct Image; -struct bNodeTree; struct AnimData; +struct Image; struct Ipo; +struct bNodeTree; /* WATCH IT: change type? also make changes in ipo.h */ diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 304e9772ddc..14c6ef33a76 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -36,8 +36,8 @@ #include "DNA_listBase.h" #include "DNA_ID.h" -struct BoundBox; struct AnimData; +struct BoundBox; struct Ipo; struct Material; diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 18676eb207d..a160df92c76 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -39,13 +39,13 @@ #include "DNA_tracking_types.h" #include "DNA_color_types.h" /* for color management */ -struct anim; struct AnimData; -struct bGPdata; struct ImBuf; struct MovieClipProxy; -struct MovieTrackingTrack; struct MovieTrackingMarker; +struct MovieTrackingTrack; +struct anim; +struct bGPdata; typedef struct MovieClipUser { /** Current frame number. */ diff --git a/source/blender/makesdna/DNA_nla_types.h b/source/blender/makesdna/DNA_nla_types.h index eadbb339bca..895c3443ad3 100644 --- a/source/blender/makesdna/DNA_nla_types.h +++ b/source/blender/makesdna/DNA_nla_types.h @@ -34,9 +34,9 @@ #include "DNA_listBase.h" -struct bAction; struct Ipo; struct Object; +struct bAction; /* simple uniform modifier structure, assumed it can hold all type info */ typedef struct bActionModifier { diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index ddf7175ba40..4698872c73c 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -38,17 +38,17 @@ #include "DNA_texture_types.h" #include "DNA_scene_types.h" +struct AnimData; struct ID; +struct Image; struct ListBase; +struct bGPdata; +struct bNodeInstanceHash; struct bNodeLink; -struct bNodeType; -struct bNodeTreeExec; struct bNodePreview; -struct bNodeInstanceHash; -struct AnimData; -struct bGPdata; +struct bNodeTreeExec; +struct bNodeType; struct uiBlock; -struct Image; /* In writefile.c: write deprecated DNA data, * to ensure forward compatibility in 2.6x versions. diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index 82694fef827..b8b6901a8e5 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -39,8 +39,8 @@ extern "C" { #endif -struct Mesh; struct Ipo; +struct Mesh; typedef struct FluidVertexVelocity { float vel[3]; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index db9fa37ebd3..963480ddb5d 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -44,21 +44,21 @@ extern "C" { #endif -struct Object; struct AnimData; -struct Ipo; struct BoundBox; -struct Path; +struct DerivedMesh; +struct FluidsimSettings; +struct GpencilBatchCache; +struct Ipo; struct Material; +struct Object; struct PartDeflect; -struct SoftBody; -struct FluidsimSettings; struct ParticleSystem; -struct DerivedMesh; +struct Path; +struct RigidBodyOb; struct SculptSession; +struct SoftBody; struct bGPdata; -struct RigidBodyOb; -struct GpencilBatchCache; /* Vertex Groups - Name Info */ typedef struct bDeformGroup { diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 165ae37b3d5..daeab6b005b 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -53,22 +53,22 @@ extern "C" { #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -struct CurveMapping; -struct Object; +struct AnimData; struct Brush; -struct World; -struct Scene; -struct Image; struct Collection; -struct Text; -struct bNodeTree; -struct AnimData; +struct ColorSpace; +struct CurveMapping; struct Editing; -struct SceneStats; -struct bGPdata; +struct Image; struct MovieClip; -struct ColorSpace; +struct Object; +struct Scene; struct SceneCollection; +struct SceneStats; +struct Text; +struct World; +struct bGPdata; +struct bNodeTree; /* ************************************************************* */ /* Scene Data */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 682cd5b6d85..e5f1c131798 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -37,12 +37,12 @@ #include "DNA_ID.h" -struct SpaceType; -struct SpaceLink; struct ARegion; struct ARegionType; struct PanelType; struct Scene; +struct SpaceLink; +struct SpaceType; struct uiLayout; struct wmDrawBuffer; struct wmTimer; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index bfaff95addc..08924e63795 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -48,9 +48,9 @@ #include "DNA_vfont_types.h" struct Ipo; +struct MovieClip; struct Scene; struct bSound; -struct MovieClip; /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index f86b650ddeb..92343efbb39 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -47,25 +47,25 @@ /* Hum ... Not really nice... but needed for spacebuts. */ #include "DNA_view2d_types.h" +struct BLI_mempool; +struct FileLayout; +struct FileList; +struct FileSelectParams; +struct Histogram; struct ID; -struct Text; -struct Script; struct Image; +struct Mask; +struct MovieClip; +struct MovieClipScopes; struct Scopes; -struct Histogram; +struct Script; struct SpaceIpo; -struct bNodeTree; -struct FileList; -struct bGPdata; +struct Text; struct bDopeSheet; -struct FileSelectParams; -struct FileLayout; +struct bGPdata; +struct bNodeTree; struct wmOperator; struct wmTimer; -struct MovieClip; -struct MovieClipScopes; -struct Mask; -struct BLI_mempool; /* TODO 2.8: We don't write the global areas to files currently. Uncomment * define to enable writing (should become the default in a bit). */ diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index cc6e557d8f3..418f53edb9e 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -43,14 +43,14 @@ extern "C" { #endif struct AnimData; -struct Ipo; struct ColorBand; -struct Object; -struct Tex; +struct CurveMapping; +struct ImBuf; struct Image; +struct Ipo; +struct Object; struct PreviewImage; -struct ImBuf; -struct CurveMapping; +struct Tex; typedef struct MTex { diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 6aad815435c..dc767993a61 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -42,13 +42,13 @@ /* match-moving data */ -struct bGPdata; struct Image; struct MovieReconstructedCamera; +struct MovieTracking; struct MovieTrackingCamera; struct MovieTrackingMarker; struct MovieTrackingTrack; -struct MovieTracking; +struct bGPdata; typedef struct MovieReconstructedCamera { int framenr; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 780383e399d..0a5554e0a96 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -32,19 +32,19 @@ #ifndef __DNA_VIEW3D_TYPES_H__ #define __DNA_VIEW3D_TYPES_H__ -struct ViewDepths; -struct Object; -struct Image; -struct SpaceLink; struct BoundBox; +struct GPUViewport; +struct Image; +struct Material; struct MovieClip; struct MovieClipUser; +struct Object; struct RenderEngine; -struct bGPdata; struct SmoothView3DStore; +struct SpaceLink; +struct ViewDepths; +struct bGPdata; struct wmTimer; -struct Material; -struct GPUViewport; #include "DNA_defs.h" #include "DNA_listBase.h" diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 3899e8bcc8d..c3760d66514 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -39,28 +39,28 @@ #include "DNA_ID.h" /* defined here: */ -struct wmWindowManager; struct wmWindow; +struct wmWindowManager; -struct wmMsgBus; struct wmEvent; struct wmGesture; -struct wmOperatorType; -struct wmOperator; -struct wmKeyMap; struct wmKeyConfig; +struct wmKeyMap; +struct wmMsgBus; +struct wmOperator; +struct wmOperatorType; /* forwards */ -struct bContext; -struct bScreen; -struct wmSubWindow; -struct wmTimer; struct PointerRNA; -struct ReportList; struct Report; -struct uiLayout; +struct ReportList; struct Stereo3dFormat; struct UndoStep; +struct bContext; +struct bScreen; +struct uiLayout; +struct wmSubWindow; +struct wmTimer; #define OP_MAX_TYPENAME 64 #define KMAP_MAX_NAME 64 diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index c95436f4723..b5e0ce3db5b 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -36,9 +36,9 @@ #include "DNA_ID.h" struct AnimData; -struct bNodeTree; struct Ipo; struct MTex; +struct bNodeTree; #ifndef MAX_MTEX #define MAX_MTEX 18 diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index b00b692a609..671b3dd871e 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -37,7 +37,6 @@ extern "C" { #endif -struct bContext; struct ID; struct IDOverrideStatic; struct IDOverrideStaticProperty; @@ -46,6 +45,7 @@ struct ListBase; struct Main; struct ReportList; struct Scene; +struct bContext; /* Types */ extern BlenderRNA BLENDER_RNA; diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h index af4f2aae780..8652ca53695 100644 --- a/source/blender/makesrna/RNA_enum_types.h +++ b/source/blender/makesrna/RNA_enum_types.h @@ -29,9 +29,9 @@ #include "RNA_types.h" +struct bNodeSocketType; struct bNodeTreeType; struct bNodeType; -struct bNodeSocketType; /* Types */ @@ -236,9 +236,9 @@ struct bNodeSocketType *rna_node_socket_type_from_enum(int value); const EnumPropertyItem *rna_node_socket_type_itemf( void *data, bool (*poll)(void *data, struct bNodeSocketType *), bool *r_free); -struct bContext; struct PointerRNA; struct PropertyRNA; +struct bContext; const EnumPropertyItem *rna_TransformOrientation_itemf(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, bool *r_free); diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 2c1bd2069b0..7aed2ce8232 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -33,14 +33,14 @@ extern "C" { #endif -struct ParameterList; +struct BlenderRNA; struct FunctionRNA; +struct Main; +struct ParameterList; struct PropertyRNA; +struct ReportList; struct StructRNA; -struct BlenderRNA; struct bContext; -struct Main; -struct ReportList; /** Pointer * diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index f03752968c9..93908e05553 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -33,20 +33,20 @@ #include "RNA_types.h" struct BlenderRNA; +struct CollectionPropertyIterator; struct ContainerRNA; -struct StructRNA; -struct PropertyRNA; -struct PointerRNA; struct FunctionRNA; -struct CollectionPropertyIterator; -struct bContext; +struct GHash; struct IDOverrideStatic; struct IDOverrideStaticProperty; struct IDOverrideStaticPropertyOperation; struct IDProperty; -struct GHash; struct Main; +struct PointerRNA; +struct PropertyRNA; struct Scene; +struct StructRNA; +struct bContext; /* store local properties here */ #define RNA_IDP_UI "_RNA_UI" diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 4bb745fbd66..3b22ea182df 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -33,11 +33,11 @@ #ifndef __MOD_FLUIDSIM_UTIL_H__ #define __MOD_FLUIDSIM_UTIL_H__ -struct Object; -struct Scene; struct FluidsimModifierData; struct Mesh; struct ModifierEvalContext; +struct Object; +struct Scene; /* new fluid-modifier interface */ void fluidsim_init(struct FluidsimModifierData *fluidmd); diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.h b/source/blender/modifiers/intern/MOD_weightvg_util.h index 93594fd8b29..e98b907d668 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.h +++ b/source/blender/modifiers/intern/MOD_weightvg_util.h @@ -37,9 +37,9 @@ struct MDeformWeight; struct Mesh; struct ModifierEvalContext; struct Object; -struct Tex; -struct Scene; struct RNG; +struct Scene; +struct Tex; /* * XXX I'd like to make modified weights visible in WeightPaint mode, diff --git a/source/blender/nodes/NOD_socket.h b/source/blender/nodes/NOD_socket.h index 3ff65ce4fd9..1b2fd75b7a7 100644 --- a/source/blender/nodes/NOD_socket.h +++ b/source/blender/nodes/NOD_socket.h @@ -41,8 +41,8 @@ #include "RNA_types.h" -struct bNodeTree; struct bNode; +struct bNodeTree; struct bNodeSocket *node_add_socket_from_template(struct bNodeTree *ntree, struct bNode *node, struct bNodeSocketTemplate *stemp, int in_out); diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h index 6771df76bf9..5b91711ebb7 100644 --- a/source/blender/nodes/intern/node_exec.h +++ b/source/blender/nodes/intern/node_exec.h @@ -43,9 +43,9 @@ #include "RNA_types.h" -struct bNodeTree; struct bNode; struct bNodeStack; +struct bNodeTree; /* Node execution data */ typedef struct bNodeExec { diff --git a/source/blender/nodes/intern/node_util.h b/source/blender/nodes/intern/node_util.h index 5c0e53c2399..c8cc750c001 100644 --- a/source/blender/nodes/intern/node_util.h +++ b/source/blender/nodes/intern/node_util.h @@ -47,8 +47,8 @@ #include "RNA_access.h" -struct bNodeTree; struct bNode; +struct bNodeTree; /* data for initializing node execution */ typedef struct bNodeExecContext { diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/physics/BPH_mass_spring.h index f1eb049dd52..e3f5ebe2fcf 100644 --- a/source/blender/physics/BPH_mass_spring.h +++ b/source/blender/physics/BPH_mass_spring.h @@ -36,11 +36,11 @@ extern "C" { #endif -struct Implicit_Data; -struct Object; struct ClothModifierData; -struct ListBase; struct Depsgraph; +struct Implicit_Data; +struct ListBase; +struct Object; struct VoxelData; typedef enum eMassSpringSolverStatus { diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index 5a2f15405c1..cadfaf365c2 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -32,19 +32,19 @@ #ifndef __BPY_EXTERN_H__ #define __BPY_EXTERN_H__ -struct PathResolvedRNA; -struct Text; /* defined in DNA_text_types.h */ -struct ID; /* DNA_ID.h */ -struct Object; /* DNA_object_types.h */ struct ChannelDriver; /* DNA_anim_types.h */ +struct ID; /* DNA_ID.h */ struct ListBase; /* DNA_listBase.h */ +struct Object; /* DNA_object_types.h */ +struct PathResolvedRNA; +struct ReportList; +struct Text; /* defined in DNA_text_types.h */ struct bConstraint; /* DNA_constraint_types.h */ -struct bPythonConstraint; /* DNA_constraint_types.h */ struct bConstraintOb; /* DNA_constraint_types.h */ struct bConstraintTarget; /* DNA_constraint_types.h*/ struct bContext; struct bContextDataResult; -struct ReportList; +struct bPythonConstraint; /* DNA_constraint_types.h */ #ifdef __cplusplus extern "C" { diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h index c8ae2596f99..7f20f94f250 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h @@ -40,9 +40,9 @@ typedef struct BPy_BMGenericMeshData { void *data; } BPy_BMGenericMeshData; -struct MLoopUV; -struct MLoopCol; struct MDeformVert; +struct MLoopCol; +struct MLoopUV; struct MVertSkin; int BPy_BMLoopUV_AssignPyObject(struct MLoopUV *data, PyObject *value); diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h index 279dad40456..89fc05cb540 100644 --- a/source/blender/python/generic/idprop_py_api.h +++ b/source/blender/python/generic/idprop_py_api.h @@ -28,9 +28,9 @@ #ifndef __IDPROP_PY_API_H__ #define __IDPROP_PY_API_H__ +struct BPy_IDGroup_Iter; struct ID; struct IDProperty; -struct BPy_IDGroup_Iter; extern PyTypeObject BPy_IDArray_Type; extern PyTypeObject BPy_IDGroup_Iter_Type; diff --git a/source/blender/python/intern/bpy_gizmo_wrap.h b/source/blender/python/intern/bpy_gizmo_wrap.h index 96f15312a4e..3306c95f4c1 100644 --- a/source/blender/python/intern/bpy_gizmo_wrap.h +++ b/source/blender/python/intern/bpy_gizmo_wrap.h @@ -25,8 +25,8 @@ #ifndef __BPY_GIZMO_WRAP_H__ #define __BPY_GIZMO_WRAP_H__ -struct wmGizmoType; struct wmGizmoGroupType; +struct wmGizmoType; /* exposed to rna/wm api */ void BPY_RNA_gizmo_wrapper(struct wmGizmoType *gzt, void *userdata); diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h index 4489efc6a10..f78f59613df 100644 --- a/source/blender/render/extern/include/RE_bake.h +++ b/source/blender/render/extern/include/RE_bake.h @@ -32,10 +32,10 @@ #ifndef __RE_BAKE_H__ #define __RE_BAKE_H__ +struct Depsgraph; struct ImBuf; -struct Render; struct Mesh; -struct Depsgraph; +struct Render; typedef struct BakeImage { struct Image *image; diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 8ce3cfe75f8..f78d9d6d828 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -39,8 +39,6 @@ #include "BLI_threads.h" -struct bNode; -struct bNodeTree; struct BakePixel; struct Depsgraph; struct IDProperty; @@ -55,6 +53,8 @@ struct RenderResult; struct ReportList; struct Scene; struct ViewLayer; +struct bNode; +struct bNodeTree; /* External Engine */ diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index bde767dc99e..5537efd4f75 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -36,8 +36,6 @@ #include "DNA_vec_types.h" #include "DEG_depsgraph.h" -struct bMovieHandle; -struct bNodeTree; struct Depsgraph; struct Image; struct ImageFormatData; @@ -48,8 +46,10 @@ struct RenderData; struct RenderResult; struct ReportList; struct Scene; -struct ViewLayer; struct StampData; +struct ViewLayer; +struct bMovieHandle; +struct bNodeTree; /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* this include is what is exposed of render to outside world */ diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h index dad88cf06fa..f631a45025f 100644 --- a/source/blender/render/extern/include/RE_render_ext.h +++ b/source/blender/render/extern/include/RE_render_ext.h @@ -40,9 +40,9 @@ struct Depsgraph; struct ImagePool; struct MTex; +struct Render; struct Scene; struct ViewLayer; -struct Render; /* render_texture.c */ /* used by particle.c, effect.c, editmesh_modes.c and brush.c, returns 1 if rgb, 0 otherwise */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 52d4961352d..903fc5266bf 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -50,11 +50,11 @@ typedef struct BakeImBufuserData { } BakeImBufuserData; /* node shaders... */ -struct Tex; -struct MTex; struct ImBuf; struct ImagePool; +struct MTex; struct Object; +struct Tex; /* this one uses nodes */ int multitex_ext(struct Tex *tex, diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 707b1f6e2a6..9fd3deb1d3e 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -40,6 +40,8 @@ #define RR_ALL_LAYERS NULL #define RR_ALL_VIEWS NULL +struct ColorManagedDisplaySettings; +struct ColorManagedViewSettings; struct ImBuf; struct ListBase; struct Render; @@ -49,8 +51,6 @@ struct RenderLayer; struct RenderResult; struct Scene; struct rcti; -struct ColorManagedDisplaySettings; -struct ColorManagedViewSettings; /* New */ diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index e5689dfff74..dd268b5e119 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -44,10 +44,10 @@ #include "RE_pipeline.h" +struct Main; struct Object; struct RenderEngine; struct ReportList; -struct Main; /* this is handed over to threaded hiding/passes/shading engine */ typedef struct RenderPart { diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index 04a456c0850..85061e4cedc 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -63,11 +63,11 @@ } \ } \ -struct TexResult; -struct Tex; -struct Image; struct ImBuf; +struct Image; struct ImagePool; +struct Tex; +struct TexResult; /* imagetexture.h */ diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index bfd555abb9a..16a9144e8b0 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -46,41 +46,41 @@ extern "C" { #endif -struct bContext; -struct bToolRef_Runtime; +struct ARegion; struct GHashIterator; +struct GPUViewport; struct IDProperty; +struct ImBuf; +struct ImageFormatData; +struct Main; +struct MenuType; +struct PointerRNA; +struct PropertyRNA; +struct ScrArea; +struct ViewLayer; +struct bContext; +struct bToolRef_Runtime; +struct rcti; +struct wmDrag; +struct wmDropBox; struct wmEvent; struct wmEventHandler; struct wmGesture; struct wmJob; struct wmMsgSubscribeKey; struct wmMsgSubscribeValue; -struct wmOperatorType; struct wmOperator; +struct wmOperatorType; struct wmPaintCursor; -struct rcti; -struct PointerRNA; -struct PropertyRNA; -struct MenuType; -struct wmDropBox; -struct wmDrag; -struct ImBuf; -struct ImageFormatData; -struct ARegion; -struct ScrArea; -struct Main; -struct ViewLayer; -struct GPUViewport; #ifdef WITH_INPUT_NDOF struct wmNDOFMotionData; #endif -typedef struct wmJob wmJob; typedef struct wmGizmo wmGizmo; typedef struct wmGizmoMap wmGizmoMap; typedef struct wmGizmoMapType wmGizmoMapType; +typedef struct wmJob wmJob; /* general API */ void WM_init_state_app_template_set(const char *app_template); diff --git a/source/blender/windowmanager/WM_toolsystem.h b/source/blender/windowmanager/WM_toolsystem.h index 5c6dc6d7cbe..69706d81e25 100644 --- a/source/blender/windowmanager/WM_toolsystem.h +++ b/source/blender/windowmanager/WM_toolsystem.h @@ -31,17 +31,17 @@ extern "C" { #endif -struct bContext; -struct bToolRef_Runtime; struct IDProperty; -struct wmMsgSubscribeKey; -struct wmMsgSubscribeValue; -struct wmOperatorType; +struct Main; struct PointerRNA; struct ScrArea; -struct Main; struct StructRNA; struct WorkSpace; +struct bContext; +struct bToolRef_Runtime; +struct wmMsgSubscribeKey; +struct wmMsgSubscribeValue; +struct wmOperatorType; /* wm_toolsystem.c */ diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 5367e7b0aef..f94eb65b8c3 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -106,13 +106,13 @@ extern "C" { #endif +struct ID; +struct ImBuf; struct bContext; struct wmEvent; -struct wmWindowManager; struct wmMsgBus; struct wmOperator; -struct ID; -struct ImBuf; +struct wmWindowManager; #include "RNA_types.h" #include "DNA_listBase.h" diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index 2a4f6b344a9..55c4acf9380 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -41,16 +41,16 @@ struct GHashIterator; struct IDProperty; struct Main; struct PropertyRNA; -struct wmKeyConfig; struct wmGizmo; -struct wmGizmoProperty; -struct wmGizmoPropertyType; -struct wmGizmoType; struct wmGizmoGroup; struct wmGizmoGroupType; struct wmGizmoMap; struct wmGizmoMapType; struct wmGizmoMapType_Params; +struct wmGizmoProperty; +struct wmGizmoPropertyType; +struct wmGizmoType; +struct wmKeyConfig; struct wmMsgSubscribeKey; struct wmMsgSubscribeValue; diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index b000305d15b..c130130b9b8 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -38,10 +38,10 @@ #include "BLI_compiler_attrs.h" -struct wmGizmoMapType; -struct wmGizmoGroupType; -struct wmGizmoGroup; struct wmGizmo; +struct wmGizmoGroup; +struct wmGizmoGroupType; +struct wmGizmoMapType; struct wmGizmoProperty; struct wmKeyConfig; diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h index a580a063aaf..d79be78eef8 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h @@ -28,10 +28,10 @@ #ifndef __WM_GIZMO_INTERN_H__ #define __WM_GIZMO_INTERN_H__ -struct wmKeyConfig; -struct wmGizmoMap; -struct GizmoGeomInfo; struct GHashIterator; +struct GizmoGeomInfo; +struct wmGizmoMap; +struct wmKeyConfig; #include "wm_gizmo_fn.h" diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h index 414109e89e5..3eb6e82c68b 100644 --- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h +++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h @@ -40,8 +40,8 @@ struct wmEventHandler; struct wmGizmoMap; -struct wmOperatorType; struct wmOperator; +struct wmOperatorType; /* -------------------------------------------------------------------- */ diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h index 89fd2fdf557..5e469a2255d 100644 --- a/source/blender/windowmanager/wm.h +++ b/source/blender/windowmanager/wm.h @@ -32,8 +32,8 @@ #define __WM_H__ struct ARegion; -struct wmWindow; struct ReportList; +struct wmWindow; #include "gizmo/wm_gizmo_wmapi.h" diff --git a/source/blender/windowmanager/wm_cursors.h b/source/blender/windowmanager/wm_cursors.h index f863d8bfdd9..50961cdf48c 100644 --- a/source/blender/windowmanager/wm_cursors.h +++ b/source/blender/windowmanager/wm_cursors.h @@ -108,8 +108,8 @@ enum { BC_YELLOW }; -struct wmWindow; struct wmEvent; +struct wmWindow; bool wm_cursor_arrow_move(struct wmWindow *win, const struct wmEvent *event); diff --git a/source/blender/windowmanager/wm_draw.h b/source/blender/windowmanager/wm_draw.h index 1e0f3cd6b35..892c621eb51 100644 --- a/source/blender/windowmanager/wm_draw.h +++ b/source/blender/windowmanager/wm_draw.h @@ -35,8 +35,8 @@ #include "GPU_glew.h" struct GPUOffScreen; -struct GPUViewport; struct GPUTexture; +struct GPUViewport; typedef struct wmDrawBuffer { struct GPUOffScreen *offscreen[2]; @@ -45,9 +45,9 @@ typedef struct wmDrawBuffer { int bound_view; } wmDrawBuffer; +struct ARegion; struct bContext; struct wmWindow; -struct ARegion; /* wm_draw.c */ void wm_draw_update(struct bContext *C); diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index fe28cbf9895..ea9de7d2902 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -37,8 +37,8 @@ #define WM_HANDLER_HANDLED 2 #define WM_HANDLER_MODAL 4 /* MODAL|BREAK means unhandled */ -struct ScrArea; struct ARegion; +struct ScrArea; /* wmKeyMap is in DNA_windowmanager.h, it's saveable */ diff --git a/source/blender/windowmanager/wm_window.h b/source/blender/windowmanager/wm_window.h index 5988c8dab17..da244314721 100644 --- a/source/blender/windowmanager/wm_window.h +++ b/source/blender/windowmanager/wm_window.h @@ -33,10 +33,10 @@ #define __WM_WINDOW_H__ struct EnumPropertyItem; -struct wmEvent; -struct wmOperator; struct PointerRNA; struct PropertyRNA; +struct wmEvent; +struct wmOperator; /* *************** internal api ************** */ void wm_ghost_init (bContext *C); |