[Bf-blender-cvs] [6fd2e65295e] master: Overlay: Wireframe: Fix missing loose edges in object mode

Clément Foucault noreply at git.blender.org
Mon Dec 2 17:45:04 CET 2019


Commit: 6fd2e65295e8f48332ce58e779424dde2f030f7f
Author: Clément Foucault
Date:   Mon Dec 2 17:44:49 2019 +0100
Branches: master
https://developer.blender.org/rB6fd2e65295e8f48332ce58e779424dde2f030f7f

Overlay: Wireframe: Fix missing loose edges in object mode

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

M	source/blender/draw/engines/overlay/overlay_wireframe.c

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

diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c
index 189df443d64..781e1c10afa 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -204,16 +204,16 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
     DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color);
 
     /* Draw loose geometry. */
-    if ((me->totpoly == 0 && me->totedge > 0) || has_edit_mesh_cage) {
-      struct GPUBatch *geom = DRW_cache_mesh_loose_edges_get(ob);
+    if (me->totedge == 0 && me->totvert > 0) {
+      struct GPUBatch *geom = DRW_cache_mesh_all_verts_get(ob);
       if (geom) {
-        OVERLAY_extra_wire(cb, geom, ob->obmat, color);
+        OVERLAY_extra_loose_points(cb, geom, ob->obmat, color);
       }
     }
-    else if (me->totedge == 0 && me->totvert > 0) {
-      struct GPUBatch *geom = DRW_cache_mesh_all_verts_get(ob);
+    else {
+      struct GPUBatch *geom = DRW_cache_mesh_loose_edges_get(ob);
       if (geom) {
-        OVERLAY_extra_loose_points(cb, geom, ob->obmat, color);
+        OVERLAY_extra_wire(cb, geom, ob->obmat, color);
       }
     }
   }



More information about the Bf-blender-cvs mailing list