[Bf-blender-cvs] [a739dc67ef3] master: Cleanup: sort file, structs

Campbell Barton noreply at git.blender.org
Wed May 27 02:53:39 CEST 2020


Commit: a739dc67ef3c15f914cc9cccd52d6c2a27501000
Author: Campbell Barton
Date:   Wed May 27 10:52:07 2020 +1000
Branches: master
https://developer.blender.org/rBa739dc67ef3c15f914cc9cccd52d6c2a27501000

Cleanup: sort file, structs

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

M	source/blender/blenkernel/BKE_screen.h
M	source/blender/blenkernel/BKE_simulation.h
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/interface/CMakeLists.txt

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

diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 8794558b81f..85c7c92a01d 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -34,6 +34,7 @@ extern "C" {
 struct ARegion;
 struct Header;
 struct ID;
+struct LibraryForeachIDData;
 struct ListBase;
 struct Menu;
 struct Panel;
@@ -48,7 +49,6 @@ struct WorkSpace;
 struct bContext;
 struct bContextDataResult;
 struct bScreen;
-struct LibraryForeachIDData;
 struct uiLayout;
 struct uiList;
 struct wmGizmoMap;
diff --git a/source/blender/blenkernel/BKE_simulation.h b/source/blender/blenkernel/BKE_simulation.h
index 534ddfe1271..ff6aaa5e30e 100644
--- a/source/blender/blenkernel/BKE_simulation.h
+++ b/source/blender/blenkernel/BKE_simulation.h
@@ -21,9 +21,9 @@
 extern "C" {
 #endif
 
+struct Depsgraph;
 struct Main;
 struct Simulation;
-struct Depsgraph;
 
 void *BKE_simulation_add(struct Main *bmain, const char *name);
 
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 8f1511ca118..7757b838afe 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -139,7 +139,6 @@ set(SRC
   intern/list_sort_impl.h
 
 
-  BLI_asan.h
   BLI_alloca.h
   BLI_allocator.hh
   BLI_args.h
@@ -149,6 +148,7 @@ set(SRC
   BLI_array_store.h
   BLI_array_store_utils.h
   BLI_array_utils.h
+  BLI_asan.h
   BLI_assert.h
   BLI_astar.h
   BLI_bitmap.h
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 2dbd979564e..58364e69679 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -34,13 +34,13 @@ struct PointerRNA;
 
 struct Brush;
 struct GP_SpaceConversion;
+struct GpRandomSettings;
 struct bGPDframe;
 struct bGPDlayer;
 struct bGPDspoint;
 struct bGPDstroke;
 struct bGPdata;
 struct tGPspoint;
-struct GpRandomSettings;
 
 struct ARegion;
 struct Depsgraph;
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index c2c27af9770..e4fb0631f06 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -68,9 +68,9 @@ set(SRC
   interface_region_tooltip.c
   interface_regions.c
   interface_style.c
-  interface_templates.c
   interface_template_search_menu.c
   interface_template_search_operator.c
+  interface_templates.c
   interface_undo.c
   interface_utils.c
   interface_widgets.c



More information about the Bf-blender-cvs mailing list