diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-04-22 14:41:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-22 14:41:28 +0300 |
commit | 8eeae02cb0529cb7cf4473732156e16e78773224 (patch) | |
tree | d7216d7751e96408c0b92ae3dc852760a78709d3 /source/blender/draw/engines | |
parent | c7991bcefcaa2924597bd8fe55ce63905fe0f23e (diff) | |
parent | 3542c5eb721348774044822c0cf8ca5083644edd (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r-- | source/blender/draw/engines/overlay/overlay_wireframe.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.c b/source/blender/draw/engines/overlay/overlay_wireframe.c index 27f3f4ae9af..4749bfe1d48 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.c +++ b/source/blender/draw/engines/overlay/overlay_wireframe.c @@ -133,7 +133,7 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata, const bool use_wire = !is_mesh_verts_only && ((pd->overlay.flag & V3D_OVERLAY_WIREFRAMES) || (ob->dtx & OB_DRAWWIRE) || (ob->dt == OB_WIRE)); - if (ELEM(ob->type, OB_CURVE, OB_SURF)) { + if (ELEM(ob->type, OB_CURVE, OB_FONT, OB_SURF)) { OVERLAY_ExtraCallBuffers *cb = OVERLAY_extra_call_buffer_get(vedata, ob); float *color; DRW_object_wire_theme_get(ob, draw_ctx->view_layer, &color); @@ -146,6 +146,12 @@ void OVERLAY_wireframe_cache_populate(OVERLAY_Data *vedata, } geom = DRW_cache_curve_edge_wire_get(ob); break; + case OB_FONT: + if (ob->runtime.curve_cache && BKE_displist_has_faces(&ob->runtime.curve_cache->disp)) { + break; + } + geom = DRW_cache_text_loose_edges_get(ob); + break; case OB_SURF: geom = DRW_cache_surf_edge_wire_get(ob); break; |