diff options
author | Campbell Barton <campbell@blender.org> | 2022-02-16 05:02:52 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-02-16 05:04:20 +0300 |
commit | 37821143dda42acb5e37e3e62a17b0da805d9abd (patch) | |
tree | fe8d75864c3d77a1abc132c59621080b8a14c8dc /source/blender | |
parent | d3b1cce4000b4b530d3ac8e2aa6b86b79b94cca0 (diff) |
Cleanup: clang-format, use static sets, sort struct declarations
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_animsys.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_curves.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_gpencil_update_cache.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_image_partial_update.hh | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node_tree_update.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image_partial_update.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_calc_edges.cc | 1 | ||||
-rw-r--r-- | source/blender/editors/include/ED_util.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_navigate.h | 4 | ||||
-rw-r--r-- | source/blender/io/usd/intern/usd_writer_material.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 2 | ||||
-rw-r--r-- | source/blender/render/RE_pipeline.h | 2 |
13 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index b448214ce28..ded64b68f79 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -88,7 +88,8 @@ struct KS_Path *BKE_keyingset_find_path(struct KeyingSet *ks, void BKE_keyingsets_copy(struct ListBase *newlist, const struct ListBase *list); /** Process the ID pointers inside a scene's keyingsets, in see `BKE_lib_query.h` for details. */ -void BKE_keyingsets_foreach_id(struct LibraryForeachIDData *data, const struct ListBase *keyingsets); +void BKE_keyingsets_foreach_id(struct LibraryForeachIDData *data, + const struct ListBase *keyingsets); /* Free the given Keying Set path */ void BKE_keyingset_free_path(struct KeyingSet *ks, struct KS_Path *ksp); diff --git a/source/blender/blenkernel/BKE_curves.h b/source/blender/blenkernel/BKE_curves.h index 7ad915b50d7..2cce15fbfd6 100644 --- a/source/blender/blenkernel/BKE_curves.h +++ b/source/blender/blenkernel/BKE_curves.h @@ -12,9 +12,9 @@ extern "C" { #endif struct BoundBox; +struct Curves; struct CustomDataLayer; struct Depsgraph; -struct Curves; struct Main; struct Object; struct Scene; diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index a40a354eef7..e586bc4247d 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -16,6 +16,7 @@ struct Brush; struct CurveMapping; struct Depsgraph; struct GHash; +struct GPencilUpdateCache; struct ListBase; struct MDeformVert; struct Main; @@ -32,7 +33,6 @@ struct bGPDlayer; struct bGPDlayer_Mask; struct bGPDstroke; struct bGPdata; -struct GPencilUpdateCache; #define GPENCIL_SIMPLIFY(scene) (scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE) #define GPENCIL_SIMPLIFY_ONPLAY(playing) \ diff --git a/source/blender/blenkernel/BKE_gpencil_update_cache.h b/source/blender/blenkernel/BKE_gpencil_update_cache.h index a4fd70eb883..52b8716bab5 100644 --- a/source/blender/blenkernel/BKE_gpencil_update_cache.h +++ b/source/blender/blenkernel/BKE_gpencil_update_cache.h @@ -14,11 +14,11 @@ extern "C" { #include "BLI_sys_types.h" /* for bool */ struct DLRBT_Tree; -struct bGPdata; -struct bGPDlayer; +struct GPencilUpdateCache; struct bGPDframe; +struct bGPDlayer; struct bGPDstroke; -struct GPencilUpdateCache; +struct bGPdata; /* GPencilUpdateCache.flag */ typedef enum eGPUpdateCacheNodeFlag { diff --git a/source/blender/blenkernel/BKE_image_partial_update.hh b/source/blender/blenkernel/BKE_image_partial_update.hh index 3804936d00f..45b08e17920 100644 --- a/source/blender/blenkernel/BKE_image_partial_update.hh +++ b/source/blender/blenkernel/BKE_image_partial_update.hh @@ -21,8 +21,8 @@ #include "DNA_image_types.h" extern "C" { -struct PartialUpdateUser; struct PartialUpdateRegister; +struct PartialUpdateUser; } namespace blender::bke::image { diff --git a/source/blender/blenkernel/BKE_node_tree_update.h b/source/blender/blenkernel/BKE_node_tree_update.h index 7998a5ec017..5e377728bb7 100644 --- a/source/blender/blenkernel/BKE_node_tree_update.h +++ b/source/blender/blenkernel/BKE_node_tree_update.h @@ -7,12 +7,12 @@ */ struct ID; +struct ImageUser; struct Main; struct bNode; struct bNodeLink; struct bNodeSocket; struct bNodeTree; -struct ImageUser; #ifdef __cplusplus extern "C" { diff --git a/source/blender/blenkernel/intern/image_partial_update.cc b/source/blender/blenkernel/intern/image_partial_update.cc index e1e4a12533a..9d5635f49ab 100644 --- a/source/blender/blenkernel/intern/image_partial_update.cc +++ b/source/blender/blenkernel/intern/image_partial_update.cc @@ -90,8 +90,8 @@ static int chunk_number_for_pixel(int pixel_offset) return chunk_offset; } -struct PartialUpdateUserImpl; struct PartialUpdateRegisterImpl; +struct PartialUpdateUserImpl; /** * Wrap PartialUpdateUserImpl to its C-struct (PartialUpdateUser). diff --git a/source/blender/blenkernel/intern/mesh_calc_edges.cc b/source/blender/blenkernel/intern/mesh_calc_edges.cc index 0524412e302..5895eb7fd71 100644 --- a/source/blender/blenkernel/intern/mesh_calc_edges.cc +++ b/source/blender/blenkernel/intern/mesh_calc_edges.cc @@ -7,6 +7,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" + #include "BLI_map.hh" #include "BLI_task.hh" #include "BLI_threads.h" diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h index 87d5adda213..bd3a6bce8e8 100644 --- a/source/blender/editors/include/ED_util.h +++ b/source/blender/editors/include/ED_util.h @@ -15,9 +15,9 @@ extern "C" { #endif struct GPUBatch; +struct IDRemapper; struct Main; struct bContext; -struct IDRemapper; /* ed_util.c */ diff --git a/source/blender/editors/space_view3d/view3d_navigate.h b/source/blender/editors/space_view3d/view3d_navigate.h index 5fbfb3e9bd8..127d08580dc 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.h +++ b/source/blender/editors/space_view3d/view3d_navigate.h @@ -14,15 +14,15 @@ #define V3D_OP_TRACKBALLSIZE (1.1f) struct ARegion; -struct bContext; struct Depsgraph; struct Dial; struct Main; -struct rcti; struct RegionView3D; struct Scene; struct ScrArea; struct View3D; +struct bContext; +struct rcti; struct wmEvent; struct wmOperator; diff --git a/source/blender/io/usd/intern/usd_writer_material.h b/source/blender/io/usd/intern/usd_writer_material.h index 80b5626e3bd..3e9b84477d5 100644 --- a/source/blender/io/usd/intern/usd_writer_material.h +++ b/source/blender/io/usd/intern/usd_writer_material.h @@ -8,10 +8,10 @@ #include <string> -struct bNode; -struct bNodeTree; struct Material; struct USDExportParams; +struct bNode; +struct bNodeTree; namespace blender::io::usd { diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index c0a9cc1ec41..fe3613548a6 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -18,8 +18,8 @@ extern "C" { struct AnimData; struct Curve; struct Curve; -struct MDeformVert; struct GPencilUpdateCache; +struct MDeformVert; #define GP_DEFAULT_PIX_FACTOR 1.0f #define GP_DEFAULT_GRID_LINES 4 diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index 6250f61b11c..2d43aa7b27f 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -11,11 +11,11 @@ #include "DNA_listBase.h" #include "DNA_vec_types.h" +struct ImBuf; struct Image; struct ImageFormatData; struct Main; struct Object; -struct ImBuf; struct RenderData; struct RenderResult; struct ReportList; |