From 38a66903e5d59cfb75515adf3951a4fffcbdf0bb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 30 Sep 2020 11:51:13 +1000 Subject: Cleanup: sort struct declarations --- source/blender/blenkernel/BKE_anim_data.h | 8 ++++---- source/blender/blenkernel/BKE_animsys.h | 8 ++++---- source/blender/blenkernel/BKE_colortools.h | 4 ++-- source/blender/blenkernel/BKE_curveprofile.h | 2 +- source/blender/blenkernel/BKE_customdata.h | 4 ++-- source/blender/blenkernel/BKE_deform.h | 4 ++-- source/blender/blenkernel/BKE_fcurve.h | 8 ++++---- source/blender/blenkernel/BKE_gpencil.h | 2 +- source/blender/blenkernel/BKE_icons.h | 4 ++-- source/blender/blenkernel/BKE_idprop.h | 8 ++++---- source/blender/blenkernel/BKE_idtype.h | 8 ++++---- source/blender/blenkernel/BKE_lib_id.h | 4 ++-- source/blender/blenkernel/BKE_lib_override.h | 2 +- source/blender/blenkernel/BKE_modifier.h | 4 ++-- source/blender/blenkernel/BKE_nla.h | 8 ++++---- source/blender/blenkernel/BKE_node.h | 8 ++++---- source/blender/blenkernel/BKE_packedFile.h | 4 ++-- source/blender/blenkernel/BKE_paint.h | 2 +- source/blender/blenloader/BLO_read_write.h | 4 ++-- source/blender/blenloader/BLO_undofile.h | 2 +- source/blender/depsgraph/intern/builder/deg_builder_nodes.h | 2 +- source/blender/depsgraph/intern/builder/deg_builder_relations.h | 2 +- source/blender/depsgraph/intern/builder/pipeline.h | 2 +- source/blender/draw/engines/image/image_private.h | 6 +++--- source/blender/draw/intern/draw_common.h | 2 +- source/blender/editors/gpencil/gpencil_trace.h | 2 +- source/blender/editors/include/ED_gizmo_library.h | 4 ++-- source/blender/editors/include/UI_interface_icons.h | 2 +- source/blender/editors/interface/interface_intern.h | 2 +- source/blender/editors/transform/transform_data.h | 2 +- source/blender/editors/transform/transform_mode.h | 2 +- source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h | 2 +- source/blender/gpu/CMakeLists.txt | 6 +++--- source/blender/gpu/GPU_buffers.h | 2 +- source/blender/makesdna/DNA_mesh_types.h | 2 +- source/blender/makesdna/DNA_screen_types.h | 2 +- source/blender/modifiers/intern/MOD_ui_common.h | 2 +- source/blender/shader_fx/intern/FX_ui_common.h | 2 +- source/blender/simulation/intern/simulation_solver_influences.hh | 4 ++-- 39 files changed, 74 insertions(+), 74 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; diff --git a/source/blender/blenloader/BLO_read_write.h b/source/blender/blenloader/BLO_read_write.h index e3ba7480b18..5d685cc6687 100644 --- a/source/blender/blenloader/BLO_read_write.h +++ b/source/blender/blenloader/BLO_read_write.h @@ -47,10 +47,10 @@ extern "C" { #endif -typedef struct BlendWriter BlendWriter; typedef struct BlendDataReader BlendDataReader; -typedef struct BlendLibReader BlendLibReader; typedef struct BlendExpander BlendExpander; +typedef struct BlendLibReader BlendLibReader; +typedef struct BlendWriter BlendWriter; /* Blend Write API * =============== diff --git a/source/blender/blenloader/BLO_undofile.h b/source/blender/blenloader/BLO_undofile.h index 17b21096bf3..fc41a6e832f 100644 --- a/source/blender/blenloader/BLO_undofile.h +++ b/source/blender/blenloader/BLO_undofile.h @@ -24,8 +24,8 @@ * \ingroup blenloader */ -struct Scene; struct GHash; +struct Scene; typedef struct { void *next, *prev; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 40f42705a52..6f7a8b1c6b5 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -31,7 +31,6 @@ #include "DEG_depsgraph.h" -struct bNodeSocket; struct CacheFile; struct Camera; struct Collection; @@ -61,6 +60,7 @@ struct bAction; struct bArmature; struct bConstraint; struct bGPdata; +struct bNodeSocket; struct bNodeTree; struct bPoseChannel; struct bSound; diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 7f5e4cafeea..cbfb51c59a6 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -46,7 +46,6 @@ #include "intern/node/deg_node_operation.h" struct Base; -struct bNodeSocket; struct CacheFile; struct Camera; struct Collection; @@ -79,6 +78,7 @@ struct bAction; struct bArmature; struct bConstraint; struct bGPdata; +struct bNodeSocket; struct bNodeTree; struct bPoseChannel; struct bSound; diff --git a/source/blender/depsgraph/intern/builder/pipeline.h b/source/blender/depsgraph/intern/builder/pipeline.h index d98d834932c..dcd1bc6f26e 100644 --- a/source/blender/depsgraph/intern/builder/pipeline.h +++ b/source/blender/depsgraph/intern/builder/pipeline.h @@ -27,10 +27,10 @@ #include "intern/depsgraph_type.h" +struct Depsgraph; struct Main; struct Scene; struct ViewLayer; -struct Depsgraph; namespace blender { namespace deg { diff --git a/source/blender/draw/engines/image/image_private.h b/source/blender/draw/engines/image/image_private.h index 312a05e0b3b..0b5acd8bb54 100644 --- a/source/blender/draw/engines/image/image_private.h +++ b/source/blender/draw/engines/image/image_private.h @@ -25,11 +25,11 @@ extern "C" { #endif /* Forward declarations */ -struct rcti; struct GPUBatch; -struct Image; -struct ImBuf; struct GPUTexture; +struct ImBuf; +struct Image; +struct rcti; /* *********** LISTS *********** */ diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index 17db02d986f..23dd47d4ab5 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -24,9 +24,9 @@ struct DRWPass; struct DRWShadingGroup; +struct FluidModifierData; struct GPUMaterial; struct ModifierData; -struct FluidModifierData; struct Object; struct ParticleSystem; struct RegionView3D; diff --git a/source/blender/editors/gpencil/gpencil_trace.h b/source/blender/editors/gpencil/gpencil_trace.h index 7ac35ee5e04..3adde7651cd 100644 --- a/source/blender/editors/gpencil/gpencil_trace.h +++ b/source/blender/editors/gpencil/gpencil_trace.h @@ -25,11 +25,11 @@ #define __GPENCIL_TRACE_H__ /* internal exports only */ -struct bGPDframe; struct FILE; struct ImBuf; struct Main; struct Object; +struct bGPDframe; #include "potracelib.h" diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h index 0ee3b00e426..861b563521f 100644 --- a/source/blender/editors/include/ED_gizmo_library.h +++ b/source/blender/editors/include/ED_gizmo_library.h @@ -42,13 +42,13 @@ void ED_gizmotypes_blank_3d(void); void ED_gizmotypes_snap_3d(void); struct ARegion; -struct bContext; struct Depsgraph; struct Object; struct SnapObjectContext; -struct wmWindowManager; struct View3D; +struct bContext; struct wmGizmo; +struct wmWindowManager; /* -------------------------------------------------------------------- */ /* Shape Presets diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index 307873e09f0..78fcd6e7dfa 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -27,12 +27,12 @@ extern "C" { #endif +struct Collection; struct ID; struct PointerRNA; struct PreviewImage; struct Scene; struct bContext; -struct Collection; enum eIconSizes; diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 0c49489ab4e..60d60102736 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -31,8 +31,8 @@ #include "UI_interface.h" #include "UI_resources.h" -struct AnimationEvalContext; struct ARegion; +struct AnimationEvalContext; struct CurveMapping; struct CurveProfile; struct ID; diff --git a/source/blender/editors/transform/transform_data.h b/source/blender/editors/transform/transform_data.h index 18191f18430..726e70c5e4d 100644 --- a/source/blender/editors/transform/transform_data.h +++ b/source/blender/editors/transform/transform_data.h @@ -23,8 +23,8 @@ #pragma once -struct bConstraint; struct Object; +struct bConstraint; #define TRANSDATABASIC \ /** Extra data (mirrored element pointer, in editmode mesh to BMVert) \ diff --git a/source/blender/editors/transform/transform_mode.h b/source/blender/editors/transform/transform_mode.h index 51aca7d551c..df7d10d1028 100644 --- a/source/blender/editors/transform/transform_mode.h +++ b/source/blender/editors/transform/transform_mode.h @@ -25,11 +25,11 @@ #pragma once struct AnimData; -struct bContext; struct LinkNode; struct TransData; struct TransDataContainer; struct TransInfo; +struct bContext; struct wmOperator; /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */ diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h index 6590c04f03e..d20557109b1 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.h @@ -27,8 +27,8 @@ extern "C" { #include "MOD_gpencil_modifiertypes.h" struct ARegionType; -struct bContext; struct PanelType; +struct bContext; struct uiLayout; typedef void (*PanelDrawFn)(const bContext *, Panel *); diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 2dd61a3548b..482e4086452 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -91,9 +91,9 @@ set(SRC opengl/gl_backend.cc opengl/gl_batch.cc opengl/gl_context.cc - opengl/gl_drawlist.cc opengl/gl_debug.cc opengl/gl_debug_layer.cc + opengl/gl_drawlist.cc opengl/gl_framebuffer.cc opengl/gl_immediate.cc opengl/gl_index_buffer.cc @@ -148,12 +148,12 @@ set(SRC intern/gpu_material_library.h intern/gpu_matrix_private.h intern/gpu_node_graph.h - intern/gpu_private.h intern/gpu_platform_private.hh + intern/gpu_private.h intern/gpu_query.hh intern/gpu_select_private.h - intern/gpu_shader_private.hh intern/gpu_shader_interface.hh + intern/gpu_shader_private.hh intern/gpu_state_private.hh intern/gpu_texture_private.hh intern/gpu_uniform_buffer_private.hh diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index 25e9625a0b3..b770bde65fc 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -36,9 +36,9 @@ struct DMFlagMat; struct GSet; struct MLoop; struct MLoopCol; -struct MPropCol; struct MLoopTri; struct MPoly; +struct MPropCol; struct MVert; struct Mesh; struct PBVH; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index a0baf0ed905..e2837ba85f8 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -44,8 +44,8 @@ struct MLoopCol; struct MLoopTri; struct MLoopUV; struct MPoly; -struct MVert; struct MPropCol; +struct MVert; struct Material; struct Mesh; struct Multires; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index c275def5414..fefea225a5a 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -33,6 +33,7 @@ struct ARegion; struct ARegionType; struct PanelType; +struct PointerRNA; struct Scene; struct SpaceLink; struct SpaceType; @@ -40,7 +41,6 @@ struct uiLayout; struct wmDrawBuffer; struct wmTimer; struct wmTooltipState; -struct PointerRNA; /* TODO Doing this is quite ugly :) * Once the top-bar is merged bScreen should be refactored to use ScrAreaMap. */ diff --git a/source/blender/modifiers/intern/MOD_ui_common.h b/source/blender/modifiers/intern/MOD_ui_common.h index 24ada426635..e7f801049b8 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.h +++ b/source/blender/modifiers/intern/MOD_ui_common.h @@ -30,8 +30,8 @@ extern "C" { #endif struct ARegionType; -struct bContext; struct PanelType; +struct bContext; struct uiLayout; typedef void (*PanelDrawFn)(const bContext *, struct Panel *); diff --git a/source/blender/shader_fx/intern/FX_ui_common.h b/source/blender/shader_fx/intern/FX_ui_common.h index 4402dbb4a78..151a2d31eb8 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.h +++ b/source/blender/shader_fx/intern/FX_ui_common.h @@ -27,8 +27,8 @@ extern "C" { #endif struct ARegionType; -struct bContext; struct PanelType; +struct bContext; struct uiLayout; typedef void (*PanelDrawFn)(const bContext *, Panel *); diff --git a/source/blender/simulation/intern/simulation_solver_influences.hh b/source/blender/simulation/intern/simulation_solver_influences.hh index 7dc0b3b8c8d..d33aec855b2 100644 --- a/source/blender/simulation/intern/simulation_solver_influences.hh +++ b/source/blender/simulation/intern/simulation_solver_influences.hh @@ -41,10 +41,10 @@ using fn::GMutableSpan; using fn::GSpan; using fn::MutableAttributesRef; -struct ParticleEmitterContext; -struct ParticleForceContext; struct ParticleActionContext; +struct ParticleEmitterContext; struct ParticleEventFilterContext; +struct ParticleForceContext; class ParticleEmitter { public: -- cgit v1.2.3