From 262eeb3e9539453e506435943f80161bd8950a94 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Nov 2020 10:29:00 +1100 Subject: Cleanup: sort structs, files --- source/blender/blenkernel/BKE_collection.h | 12 ++++++------ source/blender/blenkernel/BKE_layer.h | 4 ++-- source/blender/blenkernel/BKE_particle.h | 4 ++-- source/blender/blenkernel/BKE_screen.h | 6 +++--- source/blender/blenloader/CMakeLists.txt | 2 +- source/blender/draw/intern/draw_manager.h | 2 +- source/blender/editors/include/ED_buttons.h | 2 +- source/blender/makesdna/DNA_screen_types.h | 2 +- source/blender/sequencer/CMakeLists.txt | 6 +++--- source/blender/sequencer/SEQ_sequencer.h | 2 +- source/blender/sequencer/intern/proxy.h | 2 +- source/blender/sequencer/intern/render.h | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index 06fcc038f69..f35dafa15a8 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -35,17 +35,17 @@ extern "C" { struct BLI_Iterator; struct Base; +struct BlendDataReader; +struct BlendExpander; +struct BlendLibReader; +struct BlendWriter; struct Collection; +struct Library; struct Main; struct Object; struct Scene; -struct ViewLayer; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; -struct BlendExpander; struct SceneCollection; -struct Library; +struct ViewLayer; typedef struct CollectionParent { struct CollectionParent *next, *prev; diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 39ba417c988..3d5062eada0 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -34,6 +34,8 @@ extern "C" { #define TODO_LAYER /* generic todo */ struct Base; +struct BlendDataReader; +struct BlendLibReader; struct Collection; struct Depsgraph; struct LayerCollection; @@ -42,8 +44,6 @@ struct Object; struct Scene; struct View3D; struct ViewLayer; -struct BlendDataReader; -struct BlendLibReader; typedef enum eViewLayerCopyMethod { VIEWLAYER_ADD_NEW = 0, diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 755fca5a2dc..4e8a32a6e00 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -45,6 +45,8 @@ struct ParticleSystemModifierData; struct BVHTreeRay; struct BVHTreeRayHit; +struct BlendDataReader; +struct BlendLibReader; struct CustomData_MeshMasks; struct Depsgraph; struct EdgeHash; @@ -60,8 +62,6 @@ struct ModifierData; struct Object; struct RNG; struct Scene; -struct BlendDataReader; -struct BlendLibReader; #define PARTICLE_COLLISION_MAX_COLLISIONS 10 diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index 50ba4f76144..fd7f20d8839 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -33,6 +33,9 @@ extern "C" { #endif struct ARegion; +struct BlendDataReader; +struct BlendLibReader; +struct BlendWriter; struct Header; struct ID; struct LibraryForeachIDData; @@ -58,9 +61,6 @@ struct wmMsgBus; struct wmNotifier; struct wmWindow; struct wmWindowManager; -struct BlendWriter; -struct BlendDataReader; -struct BlendLibReader; /* spacetype has everything stored to get an editor working, it gets initialized via * ED_spacetypes_init() in editors/space_api/spacetypes.c */ diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index c44bd8d0039..833a5abb630 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -33,8 +33,8 @@ set(INC ../render/extern/include ../sequencer ../windowmanager - ../../../intern/guardedalloc ../../../intern/clog + ../../../intern/guardedalloc # for writefile.c: dna_type_offsets.h ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index dae204ad9f7..4f4e03938c0 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -43,8 +43,8 @@ #include "draw_instance_data.h" -struct Object; struct DupliObject; +struct Object; /* Use draw manager to call GPU_select, see: DRW_draw_select_loop */ #define USE_GPU_SELECT diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h index 90d3a527b0c..1ff160b2ca8 100644 --- a/source/blender/editors/include/ED_buttons.h +++ b/source/blender/editors/include/ED_buttons.h @@ -26,8 +26,8 @@ extern "C" { #endif -struct bContext; struct SpaceProperties; +struct bContext; int ED_buttons_tabs_list(struct SpaceProperties *sbuts, short *context_tabs_array); bool ED_buttons_tab_has_search_result(struct SpaceProperties *sbuts, const int index); diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 02c0fcbb887..7101dacc803 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -37,8 +37,8 @@ struct PointerRNA; struct Scene; struct SpaceLink; struct SpaceType; -struct uiLayout; struct uiBlock; +struct uiLayout; struct wmDrawBuffer; struct wmTimer; struct wmTooltipState; diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index 1b14207b840..3841a6e6414 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -42,16 +42,16 @@ set(INC_SYS set(SRC SEQ_sequencer.h - intern/sequencer.c - intern/sequencer.h - intern/image_cache.c intern/effects.c + intern/image_cache.c intern/modifier.c intern/prefetch.c intern/proxy.c intern/proxy.h intern/render.c intern/render.h + intern/sequencer.c + intern/sequencer.h ) set(LIB diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h index 5e6415235fc..d969b43bd50 100644 --- a/source/blender/sequencer/SEQ_sequencer.h +++ b/source/blender/sequencer/SEQ_sequencer.h @@ -36,6 +36,7 @@ struct Main; struct Mask; struct ReportList; struct Scene; +struct SeqIndexBuildContext; struct Sequence; struct SequenceModifierData; struct Stereo3dFormat; @@ -43,7 +44,6 @@ struct StripElem; struct TextVars; struct bContext; struct bSound; -struct SeqIndexBuildContext; /* Wipe effect */ enum { diff --git a/source/blender/sequencer/intern/proxy.h b/source/blender/sequencer/intern/proxy.h index ed23db1a826..3777cea9317 100644 --- a/source/blender/sequencer/intern/proxy.h +++ b/source/blender/sequencer/intern/proxy.h @@ -27,8 +27,8 @@ extern "C" { #endif -struct SeqRenderData; struct ImBuf; +struct SeqRenderData; struct Sequence; #define PROXY_MAXFILE (2 * FILE_MAXDIR + FILE_MAXFILE) diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.h index 8be4ed7c2ab..83214934e05 100644 --- a/source/blender/sequencer/intern/render.h +++ b/source/blender/sequencer/intern/render.h @@ -28,10 +28,10 @@ extern "C" { #endif struct Editing; -struct SeqRenderData; -struct ListBase; struct ImBuf; +struct ListBase; struct Scene; +struct SeqRenderData; struct Sequence; /* mutable state for sequencer */ -- cgit v1.2.3