diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-20 00:26:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-20 00:27:01 +0300 |
| commit | 39afc2775f8b3d46902b4c56841c4ab7bae86baa (patch) | |
| tree | 72cd0d3f6088d0f1fba140433127cea2c0952d3e /source/blender/draw | |
| parent | 6c0cbfcd530573c3c48b1673fe7573024ab101f6 (diff) | |
Cleanup: style
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index b0418956180..3562bfeaa95 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -3380,7 +3380,7 @@ static void mesh_create_loops_lines( BM_ITER_MESH (bm_edge, &iter, bm, BM_EDGES_OF_MESH) { /* use_hide always for edit-mode */ if (!BM_elem_flag_test(bm_edge, BM_ELEM_HIDDEN) && - bm_edge->l != NULL) + bm_edge->l != NULL) { BMLoop *bm_loop1 = BM_vert_find_first_loop(bm_edge->v1); BMLoop *bm_loop2 = BM_vert_find_first_loop(bm_edge->v2); diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index a20aaf43094..7439bd3255d 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2906,9 +2906,10 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) return; } - const bool do_outlines = (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) && - (draw_ctx->v3d->shading.type != OB_WIRE) && - ((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE)); + const bool do_outlines = ( + (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) && + (draw_ctx->v3d->shading.type != OB_WIRE) && + ((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE))); const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0); const bool hide_object_extra = (v3d->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0; |