diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-11 16:50:43 +0300 |
| commit | 06312c6d2db8a6d959bed153f76a28f9faf866f8 (patch) | |
| tree | 0c0e419621bf295ca18133d84eb6d35897584d7d /source/blender/blenkernel/intern/armature.c | |
| parent | 3fe0c32fae20be4146bfa20fe64f56f5716a132b (diff) | |
| parent | 7ad21c3876c2453f11fd509a0157639d615567fc (diff) | |
Merge branch 'master' into blender-v2.80-releasev2.80-rc1
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 6d855df8af7..65de951b190 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1372,7 +1372,8 @@ static void armature_vert_task(void *__restrict userdata, BLI_assert(i < data->mesh->totvert); if (data->mesh->dvert != NULL) { dvert = data->mesh->dvert + i; - } else { + } + else { dvert = NULL; } } |