diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-09 19:17:09 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-09 19:17:09 +0400 |
commit | 7eb3b37bec3f350773331db749d387d69bf3d518 (patch) | |
tree | 812e45c2e2d6030f18b7d67e37bf030e99ec61b1 /source/blender/blenkernel/intern/multires.c | |
parent | 8198880d44ca3a7af4f3bbd16097beceb30ec029 (diff) |
Fix #29835: joining meshes leads to crash
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 458fb895b64..3fb49d508cd 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1616,7 +1616,7 @@ static void multires_apply_smat(Scene *scene, Object *ob, float smat[3][3]) CustomData_external_read(&me->fdata, &me->id, CD_MASK_MDISPS, me->totface); mdisps= CustomData_get_layer(&me->fdata, CD_MDISPS); - if(!mdisps || !mmd) return; + if(!mdisps || !mmd || !mmd->totlvl) return; /* we need derived mesh created from highest resolution */ high_mmd= *mmd; |