diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-08-20 14:18:41 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-08-20 14:19:17 +0300 |
| commit | 31a1c2b7d2ab307475ec08dc4f7b6f8e6a9eebe1 (patch) | |
| tree | 8e94be540845cbfad99a1d5014d5a82e4ef552b1 /source/blender/draw/modes/overlay_mode.c | |
| parent | 70e10d6207c0375d514eb9c5403e3593fdf4ebbe (diff) | |
Object Mode: Add back support for the object "Maximum draw type" option
Diffstat (limited to 'source/blender/draw/modes/overlay_mode.c')
| -rw-r--r-- | source/blender/draw/modes/overlay_mode.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 9b6b7f6922d..6aa3a78672e 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -182,17 +182,20 @@ static void overlay_cache_populate(void *vedata, Object *ob) if (!stl->g_data->show_overlays) return; - if (!DRW_object_is_renderable(ob)) + if (!DRW_object_is_renderable(ob) && (ob->dt != OB_WIRE)) return; - if (stl->g_data->overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) { + if (DRW_object_is_renderable(ob) && stl->g_data->overlay.flag & V3D_OVERLAY_FACE_ORIENTATION) { struct GPUBatch *geom = DRW_cache_object_surface_get(ob); if (geom) { DRW_shgroup_call_add(pd->face_orientation_shgrp, geom, ob->obmat); } } - if ((stl->g_data->overlay.flag & V3D_OVERLAY_WIREFRAMES) || (ob->dtx & OB_DRAWWIRE)) { + if ((stl->g_data->overlay.flag & V3D_OVERLAY_WIREFRAMES) || + (ob->dtx & OB_DRAWWIRE) || + (ob->dt == OB_WIRE)) + { /* Don't do that in edit mode. */ if ((ob != draw_ctx->object_edit) && !BKE_object_is_in_editmode(ob)) { int tri_count; |