blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-04-22 21:41:28 +10:00
parent c7991bcefc 3542c5eb72
commit 8eeae02cb0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/draw/engines/overlay/overlay_wireframe.c
View File

@ -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;

3
source/blender/draw/intern/draw_cache.c
View File

@ -3081,8 +3081,7 @@ GPUBatch *DRW_cache_text_loose_edges_get(Object *ob)
return DRW_mesh_batch_cache_get_loose_edges(mesh_eval);
}
else {
/* TODO */
return NULL;
return DRW_curve_batch_cache_get_wire_edge(cu);
}
}