[Bf-blender-cvs] [81ae7773e74] master: Fix T59140 : Loose edges of final mesh does not display in edit mode

Clément Foucault noreply at git.blender.org
Mon Mar 4 19:31:45 CET 2019


Commit: 81ae7773e74a2f393b0ecf1818335c2b46668e4a
Author: Clément Foucault
Date:   Mon Mar 4 17:35:45 2019 +0100
Branches: master
https://developer.blender.org/rB81ae7773e74a2f393b0ecf1818335c2b46668e4a

Fix T59140 : Loose edges of final mesh does not display in edit mode

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

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 e04512b00ac..1d14c415af2 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2957,16 +2957,13 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 				}
 			}
 			else {
-				/* Kind of expensive in edit mode. Only show if in wireframe mode. */
 				bool has_edit_mesh_cage = false;
 				/* TODO: Should be its own function. */
 				if (is_edit_mode) {
 					BMEditMesh *embm = me->edit_mesh;
 					has_edit_mesh_cage = embm->mesh_eval_cage && (embm->mesh_eval_cage != embm->mesh_eval_final);
 				}
-				if (!is_edit_mode ||
-				    (((v3d->shading.type < OB_SOLID) || (ob->dt == OB_WIRE)) && has_edit_mesh_cage))
-				{
+				if (!is_edit_mode || has_edit_mesh_cage) {
 					struct GPUBatch *geom = DRW_cache_mesh_loose_edges_get(ob);
 					if (geom) {
 						if (theme_id == TH_UNDEFINED) {



More information about the Bf-blender-cvs mailing list