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>2013-07-01 02:04:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-01 02:04:03 +0400
commite64ae3ad7c1dbca5487854821384c51426659a9b (patch)
tree8ef10c015c4174e076fb34c4f225feb8221b05a8 /source/blender/blenkernel/intern/mesh.c
parent5dad1b2bb53ff1a452d1f01b8f464d8d96d884a5 (diff)
fix [#35914] Blender crashes when trying to use vertex selection masking on a copy directly after using SHIFT+d
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r--source/blender/blenkernel/intern/mesh.c7
1 files changed, 2 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;
}