diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-28 13:08:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-28 13:17:58 +0300 |
commit | c0f88ed8a860026e32ec6a06287fcf9394b4cf0a (patch) | |
tree | 65a06f6b9b22c85a80f2d64069d36f435eeb97aa /source/blender/blenkernel | |
parent | d473d5be5f59ed2cdd8e7b08feabcf7d9b8a8b5b (diff) |
Cleanup: sort forward declarations of enum & struct
Done using:
source/tools/utils_maintenance/c_sort_blocks.py
Diffstat (limited to 'source/blender/blenkernel')
78 files changed, 304 insertions, 304 deletions
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( |