diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-04-04 00:13:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-04 00:13:13 +0300 |
| commit | 22bc9fb4a9eca2dce4f51652d61f14f65eef0227 (patch) | |
| tree | 4e9526723e74702bfcfd23a408c4a437a014a7e9 /source/blender/draw/intern | |
| parent | 2933fd6c7c16d95c8d8e7a5b171edd35632cdb50 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 4 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache.c | 3 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_displist.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index b9b2a201c7d..76a48260fc2 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -1235,8 +1235,8 @@ static void draw_points( if (eBone) { if (is_envelope_draw) { drw_shgroup_bone_envelope( - eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root, - &eBone->rad_head, &envelope_ignore, sh_cfg); + eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root, + &eBone->rad_head, &envelope_ignore, sh_cfg); } else { drw_shgroup_bone_point(eBone->disp_mat, col_solid_root, col_hint_root, col_wire_root, sh_cfg); diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index f369048ec2f..0256564ffb5 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -3227,7 +3227,8 @@ GPUBatch *DRW_cache_mball_surface_get(Object *ob) return DRW_metaball_batch_cache_get_triangles_with_normals(ob); } -GPUBatch *DRW_cache_mball_edge_detection_get(Object *ob, bool *r_is_manifold) { +GPUBatch *DRW_cache_mball_edge_detection_get(Object *ob, bool *r_is_manifold) +{ BLI_assert(ob->type == OB_MBALL); return DRW_metaball_batch_cache_get_edge_detection(ob, r_is_manifold); } diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c index 4dfe71df36c..9f90ac4fd6c 100644 --- a/source/blender/draw/intern/draw_cache_impl_displist.c +++ b/source/blender/draw/intern/draw_cache_impl_displist.c @@ -597,9 +597,9 @@ static void set_edge_adjacency_lines_indices(EdgeHash *eh, GPUIndexBufBuilder *e static void set_edges_adjacency_lines_indices(void *thunk, uint v1, uint v2, uint v3) { - void **packed = (void**)thunk; + void **packed = (void **)thunk; GPUIndexBufBuilder *elb = (GPUIndexBufBuilder*)packed[0]; - EdgeHash *eh = (EdgeHash*)packed[1]; + EdgeHash *eh = (EdgeHash *)packed[1]; bool *r_is_manifold = (bool*)packed[2]; set_edge_adjacency_lines_indices(eh, elb, r_is_manifold, v1, v2, v3); |