diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-12 07:29:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-12 07:39:49 +0300 |
| commit | f79856f9fb12d47d08e14a1e0edaee9e638362c0 (patch) | |
| tree | e9dd1186517eec1289cef9fb1376fe2b29b9fb0e /source/blender/modifiers/intern/MOD_armature.c | |
| parent | 24d39620fb7299590220af8ea3cb4d61fdb0c9a2 (diff) | |
Cleanup: minor changes to deform functions
- Use 'float (*)[3]' to avoid casts.
- Remove unnecessary float[3] copy in gpencil_deform_verts.
- Use MEM_SAFE_FREE
- Use const arguments.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 214c6dbe9dc..800de546a5a 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -74,7 +74,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla ArmatureModifierData *tamd = (ArmatureModifierData *)target; BKE_modifier_copydata_generic(md, target, flag); - tamd->prevCos = NULL; + tamd->vert_coords_prev = NULL; } static void requiredDataMask(Object *UNUSED(ob), @@ -152,15 +152,12 @@ static void deformVerts(ModifierData *md, NULL, numVerts, amd->deformflag, - (float(*)[3])amd->prevCos, + amd->vert_coords_prev, amd->defgrp_name, mesh); /* free cache */ - if (amd->prevCos) { - MEM_freeN(amd->prevCos); - amd->prevCos = NULL; - } + MEM_SAFE_FREE(amd->vert_coords_prev); } static void deformVertsEM(ModifierData *md, @@ -186,15 +183,12 @@ static void deformVertsEM(ModifierData *md, NULL, numVerts, amd->deformflag, - (float(*)[3])amd->prevCos, + amd->vert_coords_prev, amd->defgrp_name, mesh_src); /* free cache */ - if (amd->prevCos) { - MEM_freeN(amd->prevCos); - amd->prevCos = NULL; - } + MEM_SAFE_FREE(amd->vert_coords_prev); if (mesh_src != mesh) { BKE_id_free(NULL, mesh_src); |