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:
Diffstat (limited to 'source/blender/bmesh/operators/mesh_conv.c')
-rw-r--r--source/blender/bmesh/operators/mesh_conv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c
index 53a358a824c..4020356834a 100644
--- a/source/blender/bmesh/operators/mesh_conv.c
+++ b/source/blender/bmesh/operators/mesh_conv.c
@@ -77,6 +77,10 @@ void mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) {
CustomData_add_layer(&bm->vdata, CD_SHAPE_KEYINDEX, CD_ASSIGN, NULL, 0);
+ if (me->key && ob->shapenr > me->key->totkey) {
+ ob->shapenr = me->key->totkey-1;
+ }
+
actkey = ob_get_keyblock(ob);
if(actkey && actkey->totelem == me->totvert) {
/*check if we need to generate unique ids for the shapekeys.