[Bf-blender-cvs] [f03c25bda81] master: Cleanup: sort structs

Campbell Barton noreply at git.blender.org
Mon Jan 4 07:41:50 CET 2021 

Commit: f03c25bda8127ea3f7d16a0afd649daec0118bbc
Author: Campbell Barton
Date:   Mon Jan 4 12:03:34 2021 +1100
Branches: master
https://developer.blender.org/rBf03c25bda8127ea3f7d16a0afd649daec0118bbc

Cleanup: sort structs

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

M	source/blender/editors/include/ED_fileselect.h
M	source/blender/sequencer/SEQ_add.h
M	source/blender/sequencer/SEQ_edit.h
M	source/blender/sequencer/SEQ_effects.h
M	source/blender/sequencer/SEQ_iterator.h
M	source/blender/sequencer/SEQ_modifier.h
M	source/blender/sequencer/SEQ_prefetch.h
M	source/blender/sequencer/SEQ_proxy.h
M	source/blender/sequencer/SEQ_relations.h
M	source/blender/sequencer/SEQ_render.h
M	source/blender/sequencer/SEQ_sequencer.h
M	source/blender/sequencer/SEQ_sound.h
M	source/blender/sequencer/SEQ_time.h
M	source/blender/sequencer/SEQ_transform.h
M	source/blender/sequencer/SEQ_util.h
M	source/blender/sequencer/SEQ_utils.h
M	source/blender/sequencer/intern/render.h

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

diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index 7b240e0569f..d12882f0e29 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -29,8 +29,8 @@ extern "C" {
 
 struct ARegion;
 struct FileAssetSelectParams;
-struct FileSelectParams;
 struct FileDirEntry;
+struct FileSelectParams;
 struct Scene;
 struct ScrArea;
 struct SpaceFile;
diff --git a/source/blender/sequencer/SEQ_add.h b/source/blender/sequencer/SEQ_add.h
index 9ed617e6963..b136cb35e09 100644
--- a/source/blender/sequencer/SEQ_add.h
+++ b/source/blender/sequencer/SEQ_add.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
+struct ListBase;
 struct Scene;
 struct Sequence;
-struct ListBase;
 struct bContext;
 
 /* api for adding new sequence strips */
diff --git a/source/blender/sequencer/SEQ_edit.h b/source/blender/sequencer/SEQ_edit.h
index b0c5d46d713..c8f11803ca8 100644
--- a/source/blender/sequencer/SEQ_edit.h
+++ b/source/blender/sequencer/SEQ_edit.h
@@ -27,10 +27,10 @@
 extern "C" {
 #endif
 
+struct ListBase;
+struct Main;
 struct Scene;
 struct Sequence;
-struct Main;
-struct ListBase;
 
 int SEQ_edit_sequence_swap(struct Sequence *seq_a, struct Sequence *seq_b, const char **error_str);
 void SEQ_edit_flag_for_removal(struct Scene *scene,
diff --git a/source/blender/sequencer/SEQ_effects.h b/source/blender/sequencer/SEQ_effects.h
index 1258efd2694..79a36be5a0b 100644
--- a/source/blender/sequencer/SEQ_effects.h
+++ b/source/blender/sequencer/SEQ_effects.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
-struct Sequence;
 struct ImBuf;
 struct SeqRenderData;
+struct Sequence;
 struct TextVars;
 
 /* Wipe effect */
diff --git a/source/blender/sequencer/SEQ_iterator.h b/source/blender/sequencer/SEQ_iterator.h
index 05fd706a8de..44908dca85a 100644
--- a/source/blender/sequencer/SEQ_iterator.h
+++ b/source/blender/sequencer/SEQ_iterator.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-struct Sequence;
 struct Editing;
+struct Sequence;
 
 typedef struct SeqIterator {
   struct Sequence **array;
diff --git a/source/blender/sequencer/SEQ_modifier.h b/source/blender/sequencer/SEQ_modifier.h
index 74948db24d4..15cbb9dde5e 100644
--- a/source/blender/sequencer/SEQ_modifier.h
+++ b/source/blender/sequencer/SEQ_modifier.h
@@ -27,15 +27,15 @@
 extern "C" {
 #endif
 
-struct Scene;
-struct Sequence;
-struct ListBase;
-struct SequenceModifierData;
-struct SeqRenderData;
-struct ImBuf;
 struct BlendDataReader;
 struct BlendLibReader;
 struct BlendWriter;
+struct ImBuf;
+struct ListBase;
+struct Scene;
+struct SeqRenderData;
+struct Sequence;
+struct SequenceModifierData;
 
 typedef struct SequenceModifierTypeInfo {
   /* default name for the modifier */
diff --git a/source/blender/sequencer/SEQ_prefetch.h b/source/blender/sequencer/SEQ_prefetch.h
index 2ec8d509a91..93fc8883e99 100644
--- a/source/blender/sequencer/SEQ_prefetch.h
+++ b/source/blender/sequencer/SEQ_prefetch.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-struct Scene;
 struct Main;
+struct Scene;
 
 void SEQ_prefetch_stop_all(void);
 void SEQ_prefetch_stop(struct Scene *scene);
diff --git a/source/blender/sequencer/SEQ_proxy.h b/source/blender/sequencer/SEQ_proxy.h
index b909ac7b02d..6934215839f 100644
--- a/source/blender/sequencer/SEQ_proxy.h
+++ b/source/blender/sequencer/SEQ_proxy.h
@@ -27,14 +27,14 @@
 extern "C" {
 #endif
 
-struct Scene;
-struct Main;
+struct Depsgraph;
 struct GSet;
-struct Sequence;
 struct ListBase;
-struct Depsgraph;
-struct SeqIndexBuildContext;
 struct ListBase;
+struct Main;
+struct Scene;
+struct SeqIndexBuildContext;
+struct Sequence;
 
 bool SEQ_proxy_rebuild_context(struct Main *bmain,
                                struct Depsgraph *depsgraph,
diff --git a/source/blender/sequencer/SEQ_relations.h b/source/blender/sequencer/SEQ_relations.h
index b2e7ac9f007..366c1002e22 100644
--- a/source/blender/sequencer/SEQ_relations.h
+++ b/source/blender/sequencer/SEQ_relations.h
@@ -27,12 +27,12 @@
 extern "C" {
 #endif
 
-struct Scene;
-struct Sequence;
-struct Main;
 struct ListBase;
-struct ReportList;
+struct Main;
 struct MovieClip;
+struct ReportList;
+struct Scene;
+struct Sequence;
 
 void SEQ_relations_sequence_free_anim(struct Sequence *seq);
 void SEQ_relations_update_changed_seq_and_deps(struct Scene *scene,
diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.h
index fea68c14c7b..fff6edc771c 100644
--- a/source/blender/sequencer/SEQ_render.h
+++ b/source/blender/sequencer/SEQ_render.h
@@ -27,12 +27,12 @@
 extern "C" {
 #endif
 
-struct Scene;
 struct Editing;
+struct ListBase;
+struct Main;
+struct Scene;
 struct Sequence;
 struct bSound;
-struct Main;
-struct ListBase;
 
 typedef enum eSeqTaskId {
   SEQ_TASK_MAIN_RENDER,
diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h
index 37ad71b64bd..ca1796c4cc4 100644
--- a/source/blender/sequencer/SEQ_sequencer.h
+++ b/source/blender/sequencer/SEQ_sequencer.h
@@ -29,6 +29,9 @@ extern "C" {
 
 #include "DNA_scene_types.h"
 
+struct BlendDataReader;
+struct BlendLibReader;
+struct BlendWriter;
 struct Depsgraph;
 struct Editing;
 struct GPUOffScreen;
@@ -41,15 +44,12 @@ struct Scene;
 struct SeqIndexBuildContext;
 struct Sequence;
 struct SequenceModifierData;
+struct SequencerToolSettings;
 struct Stereo3dFormat;
 struct StripElem;
 struct TextVars;
 struct bContext;
 struct bSound;
-struct BlendWriter;
-struct BlendDataReader;
-struct BlendLibReader;
-struct SequencerToolSettings;
 
 /* RNA enums, just to be more readable */
 enum {
diff --git a/source/blender/sequencer/SEQ_sound.h b/source/blender/sequencer/SEQ_sound.h
index d04aed259fb..1b9da928e77 100644
--- a/source/blender/sequencer/SEQ_sound.h
+++ b/source/blender/sequencer/SEQ_sound.h
@@ -27,12 +27,12 @@
 extern "C" {
 #endif
 
-struct Scene;
 struct Editing;
+struct ListBase;
+struct Main;
+struct Scene;
 struct Sequence;
 struct bSound;
-struct Main;
-struct ListBase;
 
 void SEQ_sound_update_bounds_all(struct Scene *scene);
 void SEQ_sound_update_bounds(struct Scene *scene, struct Sequence *seq);
diff --git a/source/blender/sequencer/SEQ_time.h b/source/blender/sequencer/SEQ_time.h
index 7fb47d42354..31549ff3994 100644
--- a/source/blender/sequencer/SEQ_time.h
+++ b/source/blender/sequencer/SEQ_time.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
+struct ListBase;
 struct Scene;
 struct Sequence;
-struct ListBase;
 struct rctf;
 
 void SEQ_timeline_boundbox(const struct Scene *scene,
diff --git a/source/blender/sequencer/SEQ_transform.h b/source/blender/sequencer/SEQ_transform.h
index 10d9c781dcb..d448fbdb43e 100644
--- a/source/blender/sequencer/SEQ_transform.h
+++ b/source/blender/sequencer/SEQ_transform.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
+struct ListBase;
 struct Scene;
 struct Sequence;
-struct ListBase;
 
 int SEQ_transform_get_left_handle_frame(struct Sequence *seq, bool metaclip);
 int SEQ_transform_get_right_handle_frame(struct Sequence *seq, bool metaclip);
diff --git a/source/blender/sequencer/SEQ_util.h b/source/blender/sequencer/SEQ_util.h
index 9dae0a25a37..d1e01448f4f 100644
--- a/source/blender/sequencer/SEQ_util.h
+++ b/source/blender/sequencer/SEQ_util.h
@@ -29,9 +29,9 @@
 extern "C" {
 #endif
 
+struct ListBase;
 struct Scene;
 struct Sequence;
-struct ListBase;
 
 void SEQ_set_scale_to_fit(const struct Sequence *seq,
                           const int image_width,
diff --git a/source/blender/sequencer/SEQ_utils.h b/source/blender/sequencer/SEQ_utils.h
index 417d257ddd7..45f53a64688 100644
--- a/source/blender/sequencer/SEQ_utils.h
+++ b/source/blender/sequencer/SEQ_utils.h
@@ -29,10 +29,10 @@
 extern "C" {
 #endif
 
-struct Scene;
-struct Sequence;
 struct ListBase;
 struct Mask;
+struct Scene;
+struct Sequence;
 struct StripElem;
 
 void SEQ_sort(struct Scene *scene);
diff --git a/source/blender/sequencer/intern/render.h b/source/blender/sequencer/intern/render.h
index 6875087df82..1147516b8ec 100644
--- a/source/blender/sequencer/intern/render.h
+++ b/source/blender/sequencer/intern/render.h
@@ -30,9 +30,9 @@ extern "C" {
 struct ImBuf;
 struct ListBase;
 struct Scene;
+struct SeqEffectHandle;
 struct SeqRenderData;
 struct Sequence;
-struct SeqEffectHandle;
 
 #define EARLY_NO_INPUT -1
 #define EARLY_DO_EFFECT 0

More information about the Bf-blender-cvs mailing list