Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 16 Jun 2018 16:02:50 +0000 (18:02 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 16 Jun 2018 16:02:50 +0000 (18:02 +0200)
source/blender/blenkernel/intern/deform.c

index d4ff9bd5c0c36ee8089406b6c0213a431fca3f33..2da157d5b88db7a17146d01f5b02c248b3b71c86 100644 (file)
@@ -1192,7 +1192,12 @@ bool data_transfer_layersmapping_vgroups(
 
                if (fromlayers >= 0) {
                        idx_src = fromlayers;
-                       BLI_assert(idx_src < BLI_listbase_count(&ob_src->defbase));
+                       if (idx_src >= BLI_listbase_count(&ob_src->defbase)) {
+                               /* This can happen when vgroups are removed from source object...
+                                * Remapping would be really tricky here, we'd need to go over all objects in Main everytime we delete
+                                * a vgroup... for now, simpler and safer to abort. */
+                               return false;
+                       }
                }
                else if ((idx_src = ob_src->actdef - 1) == -1) {
                        return false;