[Bf-blender-cvs] [d388c1c5249] master: Cleanup: sort file lists

Campbell Barton noreply at git.blender.org
Sun May 3 05:48:01 CEST 2020


Commit: d388c1c524948df17d6c74c3830f2803ac4933b4
Author: Campbell Barton
Date:   Sun May 3 13:45:14 2020 +1000
Branches: master
https://developer.blender.org/rBd388c1c524948df17d6c74c3830f2803ac4933b4

Cleanup: sort file lists

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/editors/include/ED_outliner.h
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/gpencil_modifiers/CMakeLists.txt
M	source/blender/gpu/GPU_shader.h

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 6b0861769c3..35dd241c173 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -48,8 +48,8 @@ struct Mesh;
 struct PBVH;
 struct PBVHNode;
 struct SubdivCCG;
-struct TaskParallelTLS;
 struct TaskParallelSettings;
+struct TaskParallelTLS;
 
 typedef struct PBVH PBVH;
 typedef struct PBVHNode PBVHNode;
diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.h
index beed0f98fb5..d3fc5174dd9 100644
--- a/source/blender/editors/include/ED_outliner.h
+++ b/source/blender/editors/include/ED_outliner.h
@@ -27,9 +27,9 @@
 extern "C" {
 #endif
 
+struct Base;
 struct ListBase;
 struct bContext;
-struct Base;
 
 bool ED_outliner_collections_editor_poll(struct bContext *C);
 
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index de9cc72dfa4..fb273cf49a8 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -17,8 +17,8 @@
 
 set(INC
   ../include
-  ../../blenkernel
   ../../blenfont
+  ../../blenkernel
   ../../blenlib
   ../../blentranslation
   ../../bmesh
diff --git a/source/blender/gpencil_modifiers/CMakeLists.txt b/source/blender/gpencil_modifiers/CMakeLists.txt
index 0e8aafad7ac..d3c85b891c6 100644
--- a/source/blender/gpencil_modifiers/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers/CMakeLists.txt
@@ -56,10 +56,10 @@ set(SRC
   intern/MOD_gpencilsimplify.c
   intern/MOD_gpencilsmooth.c
   intern/MOD_gpencilsubdiv.c
+  intern/MOD_gpenciltexture.c
   intern/MOD_gpencilthick.c
   intern/MOD_gpenciltime.c
   intern/MOD_gpenciltint.c
-  intern/MOD_gpenciltexture.c
 
   MOD_gpencil_modifiertypes.h
 )
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index dd64b858b35..0e382f2225f 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -29,9 +29,9 @@ extern "C" {
 #endif
 
 typedef struct GPUShader GPUShader;
+struct GPUShaderInterface;
 struct GPUTexture;
 struct GPUUniformBuffer;
-struct GPUShaderInterface;
 
 /* GPU Shader
  * - only for fragment shaders now



More information about the Bf-blender-cvs mailing list