diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-08-26 19:11:57 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-08-26 19:11:57 +0300 |
| commit | 015141a3e3a84a8ec2303c540605a4f5ff7e6a66 (patch) | |
| tree | e1cf2b4f648937fd3fabdaf76347c3ab5d0578d1 /source/blender/modifiers | |
| parent | 6f740256b8cf2af41ccb93a0b70bbe60c35eb9d2 (diff) | |
| parent | aaea263be4d0ffc5b23ac5752a1d15d31eb9c7ca (diff) | |
Merge branch 'master' into refactor-mesh-uv-map-generic
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 56dd1fc50f8..3649a108ed4 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -49,11 +49,11 @@ static void deformMatrices(ModifierData *md, { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); - float scale[3][3]; (void)vertexCos; /* unused */ if (kb && kb->totelem == verts_num && kb != key->refkey) { + float scale[3][3]; int a; if (ctx->object->shapeflag & OB_SHAPE_LOCK) { @@ -95,15 +95,14 @@ static void deformMatricesEM(ModifierData *UNUSED(md), { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); - float scale[3][3]; (void)vertexCos; /* unused */ if (kb && kb->totelem == verts_num && kb != key->refkey) { - int a; + float scale[3][3]; scale_m3_fl(scale, kb->curval); - for (a = 0; a < verts_num; a++) { + for (int a = 0; a < verts_num; a++) { copy_m3_m3(defMats[a], scale); } } |