[Bf-blender-cvs] [4887b771f9d] master: Cleanup: sort struct declarations

Campbell Barton noreply at git.blender.org
Tue May 14 12:23:18 CEST 2019


Commit: 4887b771f9ded1d2eb006e5e1df37595391e2760
Author: Campbell Barton
Date:   Tue May 14 20:20:01 2019 +1000
Branches: master
https://developer.blender.org/rB4887b771f9ded1d2eb006e5e1df37595391e2760

Cleanup: sort struct declarations

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/depsgraph/intern/builder/deg_builder.h
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M	source/blender/depsgraph/intern/builder/deg_builder_relations.h
M	source/blender/editors/include/ED_time_scrub_ui.h
M	source/blender/gpu/GPU_buffers.h

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 9b15462de6b..315c0224b11 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -34,13 +34,13 @@ struct CCGKey;
 struct CustomData;
 struct DMFlagMat;
 struct GPUBatch;
+struct GPU_PBVH_Buffers;
 struct MLoop;
 struct MLoopTri;
 struct MPoly;
 struct MVert;
 struct PBVH;
 struct PBVHNode;
-struct GPU_PBVH_Buffers;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index 224e3212d57..040bb6cfeea 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -23,10 +23,10 @@
 
 #pragma once
 
-struct bPoseChannel;
 struct Base;
 struct Main;
 struct Object;
+struct bPoseChannel;
 
 namespace DEG {
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 68fb9ab6cc2..41314380b23 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -32,7 +32,6 @@
 #include "DEG_depsgraph.h"
 
 struct Base;
-struct bSound;
 struct CacheFile;
 struct Camera;
 struct Collection;
@@ -63,6 +62,7 @@ struct bConstraint;
 struct bGPdata;
 struct bNodeTree;
 struct bPoseChannel;
+struct bSound;
 
 struct PropertyRNA;
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index e84bd857090..1cf0b48128f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -45,7 +45,6 @@
 #include "intern/node/deg_node_operation.h"
 
 struct Base;
-struct bSound;
 struct CacheFile;
 struct Camera;
 struct Collection;
@@ -79,6 +78,7 @@ struct bConstraint;
 struct bGPdata;
 struct bNodeTree;
 struct bPoseChannel;
+struct bSound;
 
 struct PropertyRNA;
 
diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.h
index 26d9f3d923f..a2e3098e949 100644
--- a/source/blender/editors/include/ED_time_scrub_ui.h
+++ b/source/blender/editors/include/ED_time_scrub_ui.h
@@ -24,8 +24,8 @@
 #ifndef __ED_SCRUBBING_H__
 #define __ED_SCRUBBING_H__
 
-struct bContext;
 struct View2DGrid;
+struct bContext;
 struct bDopeSheet;
 struct wmEvent;
 
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 718553e2b1c..9009c134837 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -32,10 +32,10 @@ struct CCGKey;
 struct DMFlagMat;
 struct GSet;
 struct MLoop;
+struct MLoopCol;
 struct MLoopTri;
 struct MPoly;
 struct MVert;
-struct MLoopCol;
 struct PBVH;
 
 /* Buffers for drawing from PBVH grids. */



More information about the Bf-blender-cvs mailing list