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:
authorCampbell Barton <ideasman42@gmail.com>2020-05-12 15:10:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-05-12 15:10:13 +0300
commit94934199e733b022589ea82a7038b191804c5b7c (patch)
tree83404410bd2b42c7776cdebcb86f3a670160e25c /source/blender/blenkernel
parent03727082e9dd5a30d249361c9be6555116bcf2bd (diff)
parent973ab436f07c652cb6aa13bedc351df06bce6561 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/mesh_validate.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index 3343d41b13c..f64ed609d18 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -1593,8 +1593,15 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool update, const bool select)
MLoop *l_prev = (l + (mp->totloop - 1));
int j;
for (j = 0; j < mp->totloop; j++, l++) {
- /* lookup hashed edge index */
- med_index = POINTER_AS_INT(BLI_edgehash_lookup(eh, l_prev->v, l->v));
+ /* Lookup hashed edge index, if it's valid. */
+ if (l_prev->v != l->v) {
+ med_index = POINTER_AS_INT(BLI_edgehash_lookup(eh, l_prev->v, l->v));
+ }
+ else {
+ /* This is an invalid edge; normally this does not happen in Blender, but it can be part
+ * of an imported mesh with invalid geometry. See T76514. */
+ med_index = 0;
+ }
l_prev->e = med_index;
l_prev = l;
}