[Bf-blender-cvs] [d62f8a31763] master: Overlay: Remove extra contour drawing in wireframe mode

[Clément Foucault]

Commit: d62f8a3176393998b3c2a6aa19896eb292ed215f
Author: Clément Foucault
Date:   Mon Feb 18 15:52:00 2019 +0100
Branches: master
https://developer.blender.org/rBd62f8a3176393998b3c2a6aa19896eb292ed215f

Overlay: Remove extra contour drawing in wireframe mode

This removes the overhead of rendering the object one more time.

===================================================================

M	source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 0c82c39f8b4..86ab27fe6a1 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2904,6 +2904,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 	}
 
 	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;