From 8ac0fef4dfd142ec3d185fd3572abea948e664c9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 14 Jun 2019 10:12:10 +1000 Subject: [PATCH] Cleanup: sort structs --- source/blender/blenkernel/BKE_sound.h | 2 +- source/blender/depsgraph/DEG_depsgraph_build.h | 2 +- source/blender/draw/intern/DRW_render.h | 2 +- source/blender/editors/sculpt_paint/sculpt_intern.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h index 4694e86f4d6..1567985bd53 100644 --- a/source/blender/blenkernel/BKE_sound.h +++ b/source/blender/blenkernel/BKE_sound.h @@ -29,10 +29,10 @@ # include #endif +struct Depsgraph; struct Main; struct Sequence; struct bSound; -struct Depsgraph; typedef struct SoundWaveform { int length; diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h index effcece6e00..2f342e3d0ef 100644 --- a/source/blender/depsgraph/DEG_depsgraph_build.h +++ b/source/blender/depsgraph/DEG_depsgraph_build.h @@ -33,7 +33,6 @@ struct Depsgraph; /* ------------------------------------------------ */ -struct bNodeTree; struct CacheFile; struct Collection; struct CustomData_MeshMasks; @@ -44,6 +43,7 @@ struct ModifierData; struct Object; struct Scene; struct ViewLayer; +struct bNodeTree; #ifdef __cplusplus extern "C" { diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index b10e6c4e202..51918f45e23 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -81,9 +81,9 @@ struct rcti; typedef struct DRWInterface DRWInterface; typedef struct DRWPass DRWPass; -typedef struct DRWView DRWView; typedef struct DRWShadingGroup DRWShadingGroup; typedef struct DRWUniform DRWUniform; +typedef struct DRWView DRWView; /* Opaque type to avoid usage as a DRWCall but it is exactly the same thing. */ typedef struct DRWCallBuffer DRWCallBuffer; diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 4287feed92c..e66e1c49685 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -33,8 +33,8 @@ #include "BKE_pbvh.h" -struct Main; struct KeyBlock; +struct Main; struct Object; struct SculptOrigVertData; struct SculptUndoNode;