diff options
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 7 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 9070e253d45..4ec86cbac7b 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -517,9 +517,9 @@ Mesh *BKE_mesh_copy_ex(Main *bmain, Mesh *me) } } - men->mselect = NULL; men->edit_btmesh = NULL; + men->mselect = MEM_dupallocN(men->mselect); men->bb = MEM_dupallocN(men->bb); men->key = BKE_key_copy(me->key); @@ -3938,10 +3938,7 @@ int BKE_mesh_mselect_active_get(Mesh *me, int type) { BLI_assert(ELEM3(type, ME_VSEL, ME_ESEL, ME_FSEL)); - /* XXX how can it be that sometimes me->mselect is NULL here ? - It happens, but its not clear why it happens! - */ - if (me->totselect && me->mselect) { + if (me->totselect) { if (me->mselect[me->totselect - 1].type == type) { return me->mselect[me->totselect - 1].index; } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 673cd3f7b26..5d30bf6ff73 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4148,6 +4148,11 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) mesh->bb = NULL; mesh->edit_btmesh = NULL; + /* happens with old files */ + if (mesh->mselect == NULL) { + mesh->totselect = 0; + } + /* Multires data */ mesh->mr= newdataadr(fd, mesh->mr); if (mesh->mr) { |