diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-09-30 04:51:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-30 04:51:13 +0300 |
commit | 38a66903e5d59cfb75515adf3951a4fffcbdf0bb (patch) | |
tree | f8b0e45bd3aaf23959a6864d277960168c14afe2 /source/blender/blenkernel | |
parent | e5aa9decb23f1a9f417799dbdff275b2f16a145f (diff) |
Cleanup: sort struct declarations
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_anim_data.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_animsys.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_colortools.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_curveprofile.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_deform.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_fcurve.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_icons.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_idtype.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_lib_id.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_lib_override.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_nla.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_packedFile.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 2 |
18 files changed, 46 insertions, 46 deletions
diff --git a/source/blender/blenkernel/BKE_anim_data.h b/source/blender/blenkernel/BKE_anim_data.h index 5293d8dd9b0..6c07708b5ef 100644 --- a/source/blender/blenkernel/BKE_anim_data.h +++ b/source/blender/blenkernel/BKE_anim_data.h @@ -30,15 +30,15 @@ extern "C" { #endif struct AnimData; +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct ID; struct LibraryForeachIDData; struct Main; struct ReportList; struct bAction; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; /* ************************************* */ /* AnimData API */ diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index fa3c59c781d..e9819e6ea87 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -30,6 +30,10 @@ extern "C" { #endif struct AnimData; +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct Depsgraph; struct FCurve; struct ID; @@ -46,10 +50,6 @@ struct Scene; struct bAction; struct bActionGroup; struct bContext; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; /* Container for data required to do FCurve and Driver evaluation. */ typedef struct AnimationEvalContext { diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h index 73fe50c0c4f..e56a1ac9ce3 100644 --- a/source/blender/blenkernel/BKE_colortools.h +++ b/source/blender/blenkernel/BKE_colortools.h @@ -26,6 +26,8 @@ extern "C" { #endif +struct BlendDataReader; +struct BlendWriter; struct ColorManagedColorspaceSettings; struct ColorManagedDisplaySettings; struct ColorManagedViewSettings; @@ -36,8 +38,6 @@ struct Histogram; struct ImBuf; struct Scopes; struct rctf; -struct BlendWriter; -struct BlendDataReader; void BKE_curvemapping_set_defaults( struct CurveMapping *cumap, int tot, float minx, float miny, float maxx, float maxy); diff --git a/source/blender/blenkernel/BKE_curveprofile.h b/source/blender/blenkernel/BKE_curveprofile.h index 4c785566f9c..67f9095924a 100644 --- a/source/blender/blenkernel/BKE_curveprofile.h +++ b/source/blender/blenkernel/BKE_curveprofile.h @@ -29,8 +29,8 @@ extern "C" { #endif -struct BlendWriter; struct BlendDataReader; +struct BlendWriter; struct CurveProfile; struct CurveProfilePoint; diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index fea9bbe9bb5..51650d161ea 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -34,11 +34,11 @@ extern "C" { #endif struct BMesh; +struct BlendDataReader; +struct BlendWriter; struct CustomData; struct CustomData_MeshMasks; struct ID; -struct BlendWriter; -struct BlendDataReader; typedef uint64_t CustomDataMask; /*a data type large enough to hold 1 element from any customdata layer type*/ diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h index e007204fcd7..2f3ec69418f 100644 --- a/source/blender/blenkernel/BKE_deform.h +++ b/source/blender/blenkernel/BKE_deform.h @@ -28,6 +28,8 @@ extern "C" { * \brief support for deformation groups and hooks. */ +struct BlendDataReader; +struct BlendWriter; struct ListBase; struct MDeformVert; struct MEdge; @@ -35,8 +37,6 @@ struct MLoop; struct MPoly; struct Object; struct bDeformGroup; -struct BlendWriter; -struct BlendDataReader; struct bDeformGroup *BKE_object_defgroup_new(struct Object *ob, const char *name); void BKE_defgroup_copy_list(struct ListBase *outbase, const struct ListBase *inbase); diff --git a/source/blender/blenkernel/BKE_fcurve.h b/source/blender/blenkernel/BKE_fcurve.h index 98702279706..52ef86671cc 100644 --- a/source/blender/blenkernel/BKE_fcurve.h +++ b/source/blender/blenkernel/BKE_fcurve.h @@ -37,6 +37,10 @@ struct FModifier; struct AnimData; struct AnimationEvalContext; struct BezTriple; +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct LibraryForeachIDData; struct PathResolvedRNA; struct PointerRNA; @@ -44,10 +48,6 @@ struct PropertyRNA; struct StructRNA; struct bAction; struct bContext; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; /* ************** Keyframe Tools ***************** */ diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index c484f0753a3..b07946856fd 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -27,6 +27,7 @@ extern "C" { #endif +struct BlendDataReader; struct Brush; struct CurveMapping; struct Depsgraph; @@ -48,7 +49,6 @@ struct bGPDlayer_Mask; struct bGPDspoint; struct bGPDstroke; struct bGPdata; -struct BlendDataReader; #define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE)) #define GPENCIL_SIMPLIFY_ONPLAY(playing) \ diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index e40489a80da..d6cf5eae323 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -73,13 +73,13 @@ struct Icon_Geom { typedef struct Icon Icon; +struct BlendDataReader; +struct BlendWriter; struct ID; struct ImBuf; struct PreviewImage; struct StudioLight; struct bGPDlayer; -struct BlendWriter; -struct BlendDataReader; enum eIconSizes; diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 07a82802da8..37a83a94079 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -28,12 +28,12 @@ extern "C" { #endif -struct ID; -struct IDProperty; -struct BlendWriter; struct BlendDataReader; -struct BlendLibReader; struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; +struct ID; +struct IDProperty; typedef union IDPropertyTemplate { int i; diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.h index 57b005d1a1e..ba63bc064a2 100644 --- a/source/blender/blenkernel/BKE_idtype.h +++ b/source/blender/blenkernel/BKE_idtype.h @@ -31,13 +31,13 @@ extern "C" { #endif +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct ID; struct LibraryForeachIDData; struct Main; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; /** IDTypeInfo.flags. */ enum { diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index 62b4b295410..7af9165e036 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -51,6 +51,8 @@ extern "C" { #endif +struct BlendDataReader; +struct BlendWriter; struct GHash; struct ID; struct Library; @@ -59,8 +61,6 @@ struct Main; struct PointerRNA; struct PropertyRNA; struct bContext; -struct BlendWriter; -struct BlendDataReader; 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_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h index 233a7d6e478..bf6b5cbccef 100644 --- a/source/blender/blenkernel/BKE_lib_override.h +++ b/source/blender/blenkernel/BKE_lib_override.h @@ -47,9 +47,9 @@ struct IDOverrideLibrary; struct IDOverrideLibraryProperty; struct IDOverrideLibraryPropertyOperation; struct Main; +struct Object; struct PointerRNA; struct PropertyRNA; -struct Object; struct Scene; struct ViewLayer; diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 6267642c577..b9622f2179a 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -29,6 +29,8 @@ extern "C" { struct ARegionType; struct BMEditMesh; +struct BlendDataReader; +struct BlendWriter; struct CustomData_MeshMasks; struct DepsNodeHandle; struct Depsgraph; @@ -40,8 +42,6 @@ struct ModifierData; struct Object; struct Scene; struct bArmature; -struct BlendWriter; -struct BlendDataReader; typedef enum { /* Should not be used, only for None modifier type */ diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h index 690dd790e03..8671324fab1 100644 --- a/source/blender/blenkernel/BKE_nla.h +++ b/source/blender/blenkernel/BKE_nla.h @@ -36,12 +36,12 @@ struct Scene; struct Speaker; struct bAction; -struct PointerRNA; -struct PropertyRNA; -struct BlendWriter; struct BlendDataReader; -struct BlendLibReader; struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; +struct PointerRNA; +struct PropertyRNA; /* ----------------------------- */ /* Data Management */ diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 3421aa9e900..06c9b9ab0ca 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -41,6 +41,10 @@ extern "C" { #define MAX_SOCKET 512 struct ARegion; +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct ColorManagedDisplaySettings; struct ColorManagedViewSettings; struct FreestyleLineStyle; @@ -72,10 +76,6 @@ struct bNodeTree; struct bNodeTreeExec; struct bNodeTreeType; struct uiLayout; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; /* -------------------------------------------------------------------- */ /** \name Node Type Definitions diff --git a/source/blender/blenkernel/BKE_packedFile.h b/source/blender/blenkernel/BKE_packedFile.h index f818f5f25fd..c45a0bc857d 100644 --- a/source/blender/blenkernel/BKE_packedFile.h +++ b/source/blender/blenkernel/BKE_packedFile.h @@ -29,6 +29,8 @@ extern "C" { #define RET_OK 0 #define RET_ERROR 1 +struct BlendDataReader; +struct BlendWriter; struct ID; struct Image; struct Main; @@ -37,8 +39,6 @@ struct ReportList; struct VFont; struct Volume; struct bSound; -struct BlendWriter; -struct BlendDataReader; enum ePF_FileCompare { PF_CMP_EQUAL = 0, diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 41185173a0c..fc6cdc397cc 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -36,8 +36,8 @@ struct BMesh; struct Brush; struct CurveMapping; struct Depsgraph; -struct EnumPropertyItem; struct EdgeSet; +struct EnumPropertyItem; struct GHash; struct GridPaintMask; struct ImagePool; |