diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-18 06:14:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-18 18:19:53 +0300 |
commit | 9df92691730a78a0bd13fea8717479e2b2055bb0 (patch) | |
tree | d4442f8097d098568023c2c2bef21dcbe7d81c22 /source/blender | |
parent | 7e1159536483a8206614a667b99c52f8a3ec3c74 (diff) |
Cleanup: sort structs, file-lists
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_cryptomatte.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node_ui_storage.hh | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_MetaData.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_render.h | 6 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_convert.h | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/IMB_colormanagement_intern.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h index eb2de96a745..2b5a6a2044b 100644 --- a/source/blender/blenkernel/BKE_cryptomatte.h +++ b/source/blender/blenkernel/BKE_cryptomatte.h @@ -31,9 +31,9 @@ extern "C" { #endif struct CryptomatteSession; -struct Material; struct ID; struct Main; +struct Material; struct Object; struct RenderResult; diff --git a/source/blender/blenkernel/BKE_node_ui_storage.hh b/source/blender/blenkernel/BKE_node_ui_storage.hh index 0b8ef60a603..ac12999731a 100644 --- a/source/blender/blenkernel/BKE_node_ui_storage.hh +++ b/source/blender/blenkernel/BKE_node_ui_storage.hh @@ -24,10 +24,10 @@ #include "DNA_modifier_types.h" #include "DNA_session_uuid_types.h" +struct ModifierData; +struct Object; struct bNode; struct bNodeTree; -struct Object; -struct ModifierData; using blender::Map; diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index e007d42b283..425932498f1 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -33,6 +33,7 @@ #include "DNA_windowmanager_types.h" /* for ReportType */ #include "zlib.h" +struct BLI_mmap_file; struct BLOCacheStorage; struct IDNameLib_Map; struct Key; @@ -41,7 +42,6 @@ struct Object; struct OldNewMap; struct ReportList; struct UserDef; -struct BLI_mmap_file; typedef struct IDNameLib_Map IDNameLib_Map; diff --git a/source/blender/compositor/intern/COM_MetaData.h b/source/blender/compositor/intern/COM_MetaData.h index 22988b0b7ee..c1e34df2791 100644 --- a/source/blender/compositor/intern/COM_MetaData.h +++ b/source/blender/compositor/intern/COM_MetaData.h @@ -25,8 +25,8 @@ #include "MEM_guardedalloc.h" /* Forward declarations. */ -struct StampData; struct RenderResult; +struct StampData; /* Cryptomatte includes hash in its meta data keys. The hash is generated from the render * layer/pass name. Compositing happens without the knowledge of the original layer and pass. The diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index 9cdecc444c8..a49fe1aa544 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -29,16 +29,16 @@ extern "C" { #endif -struct bContext; -struct bScreen; struct DEGEditorUpdateContext; struct Depsgraph; struct ID; -struct Main; struct MTex; +struct Main; struct Render; struct Scene; struct ScrArea; +struct bContext; +struct bScreen; struct wmWindow; struct wmWindowManager; diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index a7704c5d22c..1566c1e8571 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -32,12 +32,12 @@ struct ARegion; struct ARegionType; struct Main; +struct NodeInsertOfsData; struct View2D; struct bContext; struct bNode; struct bNodeLink; struct bNodeSocket; -struct NodeInsertOfsData; struct wmGizmoGroupType; struct wmKeyConfig; struct wmWindow; diff --git a/source/blender/editors/transform/transform_convert.h b/source/blender/editors/transform/transform_convert.h index bd7569b3771..36a51d57f64 100644 --- a/source/blender/editors/transform/transform_convert.h +++ b/source/blender/editors/transform/transform_convert.h @@ -24,9 +24,9 @@ #pragma once -struct BezTriple; struct BMEditMesh; struct BMesh; +struct BezTriple; struct FCurve; struct ListBase; struct Object; diff --git a/source/blender/imbuf/intern/IMB_colormanagement_intern.h b/source/blender/imbuf/intern/IMB_colormanagement_intern.h index cc3f4879eea..31dca888732 100644 --- a/source/blender/imbuf/intern/IMB_colormanagement_intern.h +++ b/source/blender/imbuf/intern/IMB_colormanagement_intern.h @@ -31,8 +31,8 @@ extern "C" { #endif struct ImBuf; -struct OCIO_ConstProcessorRcPtr; struct OCIO_ConstCPUProcessorRcPtr; +struct OCIO_ConstProcessorRcPtr; extern float imbuf_luma_coefficients[3]; extern float imbuf_xyz_to_rgb[3][3]; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 3f1f8328cef..9633ef8e121 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -37,13 +37,13 @@ struct Collection; struct ID; struct Image; struct ListBase; +struct NodeTreeUIStorage; struct bGPdata; struct bNodeInstanceHash; struct bNodeLink; struct bNodePreview; struct bNodeTreeExec; struct bNodeType; -struct NodeTreeUIStorage; struct uiBlock; #define NODE_MAXSTR 64 diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 9fd578b625d..94b6148ff9b 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -148,9 +148,9 @@ set(SRC geometry/nodes/node_geo_attribute_fill.cc geometry/nodes/node_geo_attribute_math.cc geometry/nodes/node_geo_attribute_mix.cc - geometry/nodes/node_geo_attribute_sample_texture.cc geometry/nodes/node_geo_attribute_proximity.cc geometry/nodes/node_geo_attribute_randomize.cc + geometry/nodes/node_geo_attribute_sample_texture.cc geometry/nodes/node_geo_attribute_separate_xyz.cc geometry/nodes/node_geo_attribute_vector_math.cc geometry/nodes/node_geo_boolean.cc |