diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 19:29:18 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 19:29:18 +0300 |
commit | a3a6443bfd8ac16824bdbf349913696531f348a1 (patch) | |
tree | 7362c82f1a5c492843d7ab727cefd52486d916bb /source/blender/blenkernel | |
parent | 57414e6d1de53c1c0c32304252a2e790d2fc4786 (diff) | |
parent | 42980abf8d0d126b0f472601cc47a3929217e394 (diff) |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 253b0480b3a..807f13efe14 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -188,6 +188,9 @@ void BKE_mesh_material_index_clear(struct Mesh *me); void BKE_mesh_material_remap(struct Mesh *me, const unsigned int *remap, unsigned int remap_len); void BKE_mesh_smooth_flag_set(struct Mesh *me, const bool use_smooth); +/* Needed after converting a mesh with subsurf optimal display to mesh. */ +void BKE_mesh_edges_set_draw_render(struct Mesh *me); + const char *BKE_mesh_cmp(struct Mesh *me1, struct Mesh *me2, float thresh); struct BoundBox *BKE_mesh_boundbox_get(struct Object *ob); diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 9711dcc8ef3..8272bd07411 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -980,6 +980,14 @@ void BKE_mesh_from_pointcloud(const PointCloud *pointcloud, Mesh *me) CustomData_free_layer(&me->vdata, CD_PROP_FLOAT3, me->totvert, layer_idx); } +void BKE_mesh_edges_set_draw_render(Mesh *mesh) +{ + MEdge *med = mesh->medge; + for (int i = 0; i < mesh->totedge; i++, med++) { + med->flag |= ME_EDGEDRAW | ME_EDGERENDER; + } +} + void BKE_pointcloud_to_mesh(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), Object *ob) { BLI_assert(ob->type == OB_POINTCLOUD); |