Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2020-01-31 17:33:13 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2020-02-12 20:44:39 +0300
commit6da097136cf4c287ce1e08acdaa8376dfae9a898 (patch)
treefac0014f00ddfadf95605a7a5a1bc3d29142da39 /source/blender/draw/engines/overlay/overlay_wireframe.c
parent8e4d5740c88ab12842f39a5e661fa948953bcf8a (diff)
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
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_wireframe.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_wireframe.c5
1 files changed, 5 insertions, 0 deletions
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: