[Bf-blender-cvs] [6da097136cf] master: Fix T59271: Curves with Extrude still show curve

[Philipp Oeser]

Commit: 6da097136cf4c287ce1e08acdaa8376dfae9a898
Author: Philipp Oeser
Date:   Fri Jan 31 15:33:13 2020 +0100
Branches: master
https://developer.blender.org/rB6da097136cf4c287ce1e08acdaa8376dfae9a898

Fix T59271: Curves with Extrude still show curve

Compared to 2.79, this also has the benefit of actually showing the curve
again if you set both bevel start and end to 0.0 for example.

Maniphest Tasks: T59271

Differential Revision: https://developer.blender.org/D6168

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

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 1d0c674f812..5dbdc71dae1 100644
--- a/source/blender/draw/engines/overlay/overlay_wireframe.c
+++ b/source/blender/draw/engines/overlay/overlay_wireframe.c
@@ -23,6 +23,8 @@
 #include "DNA_mesh_types.h"
 #include "DNA_view3d_types.h"
 
+#include "BKE_curve.h"
+#include "BKE_displist.h"
 #include "BKE_editmesh.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
@@ -138,6 +140,9 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata,
     struct GPUBatch *geom = NULL;
     switch (ob->type) {
       case OB_CURVE:
+        if (ob->runtime.curve_cache && BKE_displist_has_faces(&ob->runtime.curve_cache->disp)) {
+          break;
+        }
         geom = DRW_cache_curve_edge_wire_get(ob);
         break;
       case OB_SURF: