tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Bastien Montagne 2018-06-16 18:02:50 +02:00
parent dc1c820b2b ace8ad861d
commit 3b7f630a54
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/deform.c
View 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;