diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-03 00:39:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-03 00:39:45 +0300 |
commit | 93e8c962fcc1f9979d4dbb539d5ff4e1f5295068 (patch) | |
tree | 0ebeceff7c2e44099db2dfacce19593683f97153 /source/blender/draw/intern | |
parent | c07eaa3384dfe90bc2671a9bb3be2b77ad33297d (diff) |
Cleanup: unused structs, struct members
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r-- | source/blender/draw/intern/draw_armature.c | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.c | 5 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 5 |
4 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 865cfea14e3..5cd6a4a1286 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -60,7 +60,6 @@ static struct { Object *ob; /* Reset when changing current_armature */ DRWCallBuffer *bone_octahedral_solid; - DRWCallBuffer *bone_octahedral_wire; DRWCallBuffer *bone_octahedral_outline; DRWCallBuffer *bone_box_solid; DRWCallBuffer *bone_box_wire; diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 019098e5b90..b085d402e81 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -53,7 +53,6 @@ static struct DRWShapeCache { GPUBatch *drw_cursor; GPUBatch *drw_cursor_only_circle; GPUBatch *drw_fullscreen_quad; - GPUBatch *drw_fullscreen_quad_texcoord; GPUBatch *drw_quad; GPUBatch *drw_quad_wires; GPUBatch *drw_grid; @@ -72,8 +71,6 @@ static struct DRWShapeCache { GPUBatch *drw_empty_capsule_body; GPUBatch *drw_empty_capsule_cap; GPUBatch *drw_empty_cone; - GPUBatch *drw_arrows; - GPUBatch *drw_axis_names; GPUBatch *drw_image_plane; GPUBatch *drw_image_plane_wire; GPUBatch *drw_field_wind; @@ -99,7 +96,6 @@ static struct DRWShapeCache { GPUBatch *drw_bone_octahedral_wire; GPUBatch *drw_bone_box; GPUBatch *drw_bone_box_wire; - GPUBatch *drw_bone_wire_wire; GPUBatch *drw_bone_envelope; GPUBatch *drw_bone_envelope_outline; GPUBatch *drw_bone_point; @@ -111,7 +107,6 @@ static struct DRWShapeCache { GPUBatch *drw_camera; GPUBatch *drw_camera_frame; GPUBatch *drw_camera_tria; - GPUBatch *drw_camera_focus; GPUBatch *drw_particle_cross; GPUBatch *drw_particle_circle; GPUBatch *drw_particle_axis; diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 7f679dd5581..988859c64a5 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -277,7 +277,6 @@ static struct { struct GPUVertFormat *instance_scaled; struct GPUVertFormat *instance_sized; struct GPUVertFormat *instance_outline; - struct GPUVertFormat *instance; struct GPUVertFormat *instance_camera; struct GPUVertFormat *instance_distance_lines; struct GPUVertFormat *instance_spot; diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index dcf526679bf..330f72eda18 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1846,11 +1846,6 @@ void DRW_pass_foreach_shgroup(DRWPass *pass, } } -typedef struct ZSortData { - const float *axis; - const float *origin; -} ZSortData; - static int pass_shgroup_dist_sort(const void *a, const void *b) { const DRWShadingGroup *shgrp_a = (const DRWShadingGroup *)a; |