[Bf-blender-cvs] [cec35060f56] master: Cleanup: sort struct blocks

[Campbell Barton]

Commit: cec35060f563e89a567ce252a6a3ebc7fcf3318f
Author: Campbell Barton
Date:   Thu Aug 26 12:39:45 2021 +1000
Branches: master
https://developer.blender.org/rBcec35060f563e89a567ce252a6a3ebc7fcf3318f

Cleanup: sort struct blocks

===================================================================

M	source/blender/blenkernel/BKE_action.hh
M	source/blender/editors/asset/ED_asset_filter.h
M	source/blender/editors/asset/ED_asset_list.h
M	source/blender/editors/asset/ED_asset_list.hh
M	source/blender/editors/asset/ED_asset_mark_clear.h
M	source/blender/editors/asset/ED_asset_temp_id_consumer.h
M	source/blender/editors/include/ED_object.h
M	source/blender/editors/include/UI_interface.h
M	source/blender/editors/space_file/filelist.h
M	source/blender/io/gpencil/CMakeLists.txt
M	source/blender/io/usd/usd.h
M	source/blender/sequencer/SEQ_sequencer.h
M	source/blender/windowmanager/WM_types.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_action.hh b/source/blender/blenkernel/BKE_action.hh
index b9f106d367e..9b033713dc7 100644
--- a/source/blender/blenkernel/BKE_action.hh
+++ b/source/blender/blenkernel/BKE_action.hh
@@ -24,8 +24,8 @@
 
 #include "BLI_function_ref.hh"
 
-struct bAction;
 struct FCurve;
+struct bAction;
 
 namespace blender::bke {
 
diff --git a/source/blender/editors/asset/ED_asset_filter.h b/source/blender/editors/asset/ED_asset_filter.h
index fb2d3bfb273..340c4c9dbe7 100644
--- a/source/blender/editors/asset/ED_asset_filter.h
+++ b/source/blender/editors/asset/ED_asset_filter.h
@@ -24,8 +24,8 @@
 extern "C" {
 #endif
 
-struct AssetHandle;
 struct AssetFilterSettings;
+struct AssetHandle;
 
 bool ED_asset_filter_matches_asset(const struct AssetFilterSettings *filter,
                                    const struct AssetHandle *asset);
diff --git a/source/blender/editors/asset/ED_asset_list.h b/source/blender/editors/asset/ED_asset_list.h
index 55a0ac0b500..61d7729b651 100644
--- a/source/blender/editors/asset/ED_asset_list.h
+++ b/source/blender/editors/asset/ED_asset_list.h
@@ -27,8 +27,8 @@ extern "C" {
 struct AssetFilterSettings;
 struct AssetHandle;
 struct AssetLibraryReference;
-struct bContext;
 struct ID;
+struct bContext;
 struct wmNotifier;
 
 void ED_assetlist_storage_fetch(const struct AssetLibraryReference *library_reference,
diff --git a/source/blender/editors/asset/ED_asset_list.hh b/source/blender/editors/asset/ED_asset_list.hh
index fee34d929c2..dcc07f54e75 100644
--- a/source/blender/editors/asset/ED_asset_list.hh
+++ b/source/blender/editors/asset/ED_asset_list.hh
@@ -24,10 +24,10 @@
 
 #include "BLI_function_ref.hh"
 
-struct AssetLibraryReference;
 struct AssetHandle;
-struct bContext;
+struct AssetLibraryReference;
 struct FileDirEntry;
+struct bContext;
 
 std::string ED_assetlist_asset_filepath_get(const bContext *C,
                                             const AssetLibraryReference &library_reference,
diff --git a/source/blender/editors/asset/ED_asset_mark_clear.h b/source/blender/editors/asset/ED_asset_mark_clear.h
index cdd1f0d080b..7524ec6b02a 100644
--- a/source/blender/editors/asset/ED_asset_mark_clear.h
+++ b/source/blender/editors/asset/ED_asset_mark_clear.h
@@ -24,8 +24,8 @@
 extern "C" {
 #endif
 
-struct bContext;
 struct ID;
+struct bContext;
 
 bool ED_asset_mark_id(const struct bContext *C, struct ID *id);
 bool ED_asset_clear_id(struct ID *id);
diff --git a/source/blender/editors/asset/ED_asset_temp_id_consumer.h b/source/blender/editors/asset/ED_asset_temp_id_consumer.h
index 7c10d88262e..9a47e435612 100644
--- a/source/blender/editors/asset/ED_asset_temp_id_consumer.h
+++ b/source/blender/editors/asset/ED_asset_temp_id_consumer.h
@@ -30,9 +30,9 @@ typedef struct AssetTempIDConsumer AssetTempIDConsumer;
 
 struct AssetHandle;
 struct AssetLibraryReference;
-struct bContext;
 struct Main;
 struct ReportList;
+struct bContext;
 
 AssetTempIDConsumer *ED_asset_temp_id_consumer_create(const struct AssetHandle *handle);
 void ED_asset_temp_id_consumer_free(AssetTempIDConsumer **consumer);
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 3141c8f707b..a9cf04e1ad7 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -50,10 +50,10 @@ struct bContext;
 struct bFaceMap;
 struct bPoseChannel;
 struct uiLayout;
+struct wmEvent;
 struct wmKeyConfig;
 struct wmOperator;
 struct wmOperatorType;
-struct wmEvent;
 
 /* object_edit.c */
 /* context.object */
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 30be3588b5a..7211cf9f893 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -35,8 +35,8 @@ extern "C" {
 /* Struct Declarations */
 
 struct ARegion;
-struct AssetHandle;
 struct AssetFilterSettings;
+struct AssetHandle;
 struct AutoComplete;
 struct EnumPropertyItem;
 struct FileDirEntry;
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index d67cd89200b..1fb05e0f9ac 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
+struct AssetLibraryReference;
 struct BlendHandle;
 struct FileList;
-struct AssetLibraryReference;
 struct FileSelection;
 struct wmWindowManager;
 
diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt
index 4af8b506bd5..3ef9fa44ff8 100644
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -50,6 +50,9 @@ set(SRC
   intern/gpencil_io_export_base.hh
   intern/gpencil_io_import_base.hh
   intern/gpencil_io_import_svg.hh
+
+  # Only so this file is known by CMake.
+  ../../../../extern/nanosvg/nanosvg.h
 )
 
 set(LIB
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h
index 6b6b2d37162..2a036c3d398 100644
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@ -25,11 +25,11 @@
 extern "C" {
 #endif
 
-struct bContext;
-struct Object;
 struct CacheArchiveHandle;
-struct CacheReader;
 struct CacheFile;
+struct CacheReader;
+struct Object;
+struct bContext;
 
 struct USDExportParams {
   bool export_animation;
diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h
index 27463379ae0..54ef37b9049 100644
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.h
@@ -29,10 +29,10 @@ extern "C" {
 
 #include "DNA_scene_types.h"
 
-struct BlendWriter;
 struct BlendDataReader;
-struct BlendLibReader;
 struct BlendExpander;
+struct BlendLibReader;
+struct BlendWriter;
 struct Depsgraph;
 struct Editing;
 struct Scene;
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 843ceca7700..8a1ff67b37c 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -111,11 +111,11 @@
 struct ID;
 struct ImBuf;
 struct bContext;
+struct wmDrag;
+struct wmDropBox;
 struct wmEvent;
 struct wmOperator;
 struct wmWindowManager;
-struct wmDrag;
-struct wmDropBox;
 
 #include "BLI_compiler_attrs.h"
 #include "DNA_listBase.h"