diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-09-27 05:45:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-27 05:45:54 +0300 |
commit | 92686c667e713b4e05378324af26e0a43a3f8c5d (patch) | |
tree | 96613c6fc92ff4f8aa7a18e6456a8e3d8219ae2a | |
parent | 7ae85b54d7214ca9cfafa1fed4fdd7f449163474 (diff) |
Cleanup: structs, cmake file lists
-rw-r--r-- | source/blender/blenkernel/BKE_animsys.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_editmesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_curve_types.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 2 |
7 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index 7ef99fe1405..4e4528ff92b 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -25,7 +25,6 @@ */ struct AnimData; -struct ChannelDriver; struct Depsgraph; struct FCurve; struct ID; diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 37d84563402..47c8f31ead3 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -28,8 +28,8 @@ #include "BKE_customdata.h" #include "bmesh.h" -struct BMesh; struct BMLoop; +struct BMesh; struct BoundBox; struct Depsgraph; struct EditMeshData; diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index f598a81ff5e..47b44c3828a 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -189,9 +189,9 @@ set(SRC intern/scene.c intern/screen.c intern/seqcache.c - intern/seqprefetch.c intern/seqeffects.c intern/seqmodifier.c + intern/seqprefetch.c intern/sequencer.c intern/shader_fx.c intern/shrinkwrap.c diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 935920310dd..2c51eb8b7f8 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -75,12 +75,12 @@ struct RenderEngineType; struct bContext; struct rcti; +typedef struct DRWCallBuffer DRWCallBuffer; typedef struct DRWInterface DRWInterface; typedef struct DRWPass DRWPass; typedef struct DRWShadingGroup DRWShadingGroup; typedef struct DRWUniform DRWUniform; typedef struct DRWView DRWView; -typedef struct DRWCallBuffer DRWCallBuffer; /* TODO Put it somewhere else? */ typedef struct BoundSphere { diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index b90fff29a84..ff2afbc0cd7 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -267,7 +267,6 @@ typedef struct TransDataNla { int handle; } TransDataNla; -struct GHash; struct LinkNode; /* header of TransDataEdgeSlideVert, TransDataEdgeSlideEdge */ diff --git a/source/blender/makesdna/DNA_curve_types.h b/source/blender/makesdna/DNA_curve_types.h index 919ad598cec..759029ad618 100644 --- a/source/blender/makesdna/DNA_curve_types.h +++ b/source/blender/makesdna/DNA_curve_types.h @@ -32,7 +32,6 @@ #define MAXTEXTBOX 256 /* used in readfile.c and editfont.c */ struct AnimData; -struct BoundBox; struct EditFont; struct GHash; struct Ipo; diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 57a4ace997c..f618f964b22 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -206,9 +206,9 @@ set(SRC shader/nodes/node_shader_valToRgb.c shader/nodes/node_shader_value.c shader/nodes/node_shader_vectTransform.c - shader/nodes/node_shader_vertex_color.c shader/nodes/node_shader_vector_displacement.c shader/nodes/node_shader_vector_math.c + shader/nodes/node_shader_vertex_color.c shader/nodes/node_shader_volume_absorption.c shader/nodes/node_shader_volume_info.c shader/nodes/node_shader_volume_principled.c |