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

Campbell Barton noreply at git.blender.org
Tue Dec 17 00:13:32 CET 2019


Commit: f4d7d5e75d60a372d29a5bab81115b8ba6064062
Author: Campbell Barton
Date:   Tue Dec 17 10:08:47 2019 +1100
Branches: master
https://developer.blender.org/rBf4d7d5e75d60a372d29a5bab81115b8ba6064062

Cleanup: sort struct declarations

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

M	source/blender/blenkernel/BKE_fluid.h
M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/blenkernel/BKE_pointcache.h
M	source/blender/blenkernel/intern/fluid.c
M	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
M	source/blender/draw/intern/draw_manager_text.h
M	source/blender/gpu/GPU_buffers.h
M	source/blender/gpu/GPU_draw.h
M	source/blender/makesrna/RNA_access.h

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

diff --git a/source/blender/blenkernel/BKE_fluid.h b/source/blender/blenkernel/BKE_fluid.h
index 881653dc5ee..6c182994890 100644
--- a/source/blender/blenkernel/BKE_fluid.h
+++ b/source/blender/blenkernel/BKE_fluid.h
@@ -24,9 +24,9 @@
  * \ingroup bke
  */
 
-struct Scene;
 struct FluidDomainSettings;
 struct FluidModifierData;
+struct Scene;
 
 typedef float (*BKE_Fluid_BresenhamFn)(
     float *result, float *input, int res[3], int *pixel, float *tRay, float correct);
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 570203081fe..e1e4b99fe53 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -40,11 +40,11 @@ struct CustomData;
 struct DMFlagMat;
 struct GPU_PBVH_Buffers;
 struct IsectRayPrecalc;
-struct Mesh;
 struct MLoop;
 struct MLoopTri;
 struct MPoly;
 struct MVert;
+struct Mesh;
 struct PBVH;
 struct PBVHNode;
 struct SubdivCCG;
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 2ebe485419a..fd29480cac7 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -75,6 +75,7 @@
 
 /* Structs */
 struct ClothModifierData;
+struct FluidModifierData;
 struct ListBase;
 struct Main;
 struct Object;
@@ -83,7 +84,6 @@ struct ParticleSystem;
 struct PointCache;
 struct RigidBodyWorld;
 struct Scene;
-struct FluidModifierData;
 struct SoftBody;
 struct ViewLayer;
 
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index a996b8e8cd3..876a91a2bd3 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -78,10 +78,10 @@
 
 static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER;
 
+struct FluidModifierData;
 struct Mesh;
 struct Object;
 struct Scene;
-struct FluidModifierData;
 
 // timestep default value for nice appearance 0.1f
 #  define DT_DEFAULT 0.1f
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
index a9d528a254c..427e9c7b483 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
+++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_movieclip.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
-struct anim;
 struct MovieClip;
 struct MovieClipCache;
+struct anim;
 
 namespace DEG {
 
diff --git a/source/blender/draw/intern/draw_manager_text.h b/source/blender/draw/intern/draw_manager_text.h
index a8eb45ee8f5..393645e614a 100644
--- a/source/blender/draw/intern/draw_manager_text.h
+++ b/source/blender/draw/intern/draw_manager_text.h
@@ -23,11 +23,11 @@
 #ifndef __DRAW_MANAGER_TEXT_H__
 #define __DRAW_MANAGER_TEXT_H__
 
-struct DRWTextStore;
 struct ARegion;
-struct View3D;
+struct DRWTextStore;
 struct Object;
 struct UnitSettings;
+struct View3D;
 
 struct DRWTextStore *DRW_text_cache_create(void);
 void DRW_text_cache_destroy(struct DRWTextStore *dt);
diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h
index 6d2b0ad3be3..2ed4ee44287 100644
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@ -31,12 +31,12 @@ struct CCGElem;
 struct CCGKey;
 struct DMFlagMat;
 struct GSet;
-struct Mesh;
 struct MLoop;
 struct MLoopCol;
 struct MLoopTri;
 struct MPoly;
 struct MVert;
+struct Mesh;
 struct PBVH;
 
 /* Buffers for drawing from PBVH grids. */
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
index 9ae6b0e7508..00c8ce2353d 100644
--- a/source/blender/gpu/GPU_draw.h
+++ b/source/blender/gpu/GPU_draw.h
@@ -28,11 +28,11 @@
 extern "C" {
 #endif
 
+struct FluidModifierData;
 struct ImBuf;
 struct Image;
 struct ImageUser;
 struct Main;
-struct FluidModifierData;
 
 #include "DNA_object_enums.h"
 
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 4066458ad45..e9c9b7e2815 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -35,12 +35,12 @@ struct ID;
 struct IDOverrideLibrary;
 struct IDOverrideLibraryProperty;
 struct IDOverrideLibraryPropertyOperation;
+struct IDProperty;
 struct ListBase;
 struct Main;
 struct ReportList;
 struct Scene;
 struct bContext;
-struct IDProperty;
 
 /* Types */
 extern BlenderRNA BLENDER_RNA;



More information about the Bf-blender-cvs mailing list