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/blenkernel | |
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/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh_wrapper.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_wrapper.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 5 |
4 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_mesh_wrapper.h b/source/blender/blenkernel/BKE_mesh_wrapper.h index ec6a1e3457c..00e2dd08726 100644 --- a/source/blender/blenkernel/BKE_mesh_wrapper.h +++ b/source/blender/blenkernel/BKE_mesh_wrapper.h @@ -31,7 +31,7 @@ extern "C" { struct Mesh *BKE_mesh_wrapper_from_editmesh_with_coords( struct BMEditMesh *em, const struct CustomData_MeshMasks *cd_mask_extra, - float (*vertexCos)[3], + const float (*vert_coords)[3], const struct Mesh *me_settings); struct Mesh *BKE_mesh_wrapper_from_editmesh(struct BMEditMesh *em, const struct CustomData_MeshMasks *cd_mask_extra, diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index becb78bd6fe..1d9a2424ef8 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1566,7 +1566,7 @@ static void armature_vert_task(void *__restrict userdata, dq = &sumdq; } else { - sumvec[0] = sumvec[1] = sumvec[2] = 0.0f; + zero_v3(sumvec); vec = sumvec; if (vert_deform_mats) { @@ -1622,7 +1622,7 @@ static void armature_vert_task(void *__restrict userdata, mul_m4_v3(data->premat, co); if (use_dverts && dvert && dvert->totweight) { /* use weight groups ? */ - MDeformWeight *dw = dvert->dw; + const MDeformWeight *dw = dvert->dw; int deformed = 0; unsigned int j; for (j = dvert->totweight; j != 0; j--, dw++) { diff --git a/source/blender/blenkernel/intern/mesh_wrapper.c b/source/blender/blenkernel/intern/mesh_wrapper.c index 98b77256ad7..6a8bc698b11 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.c +++ b/source/blender/blenkernel/intern/mesh_wrapper.c @@ -53,7 +53,7 @@ Mesh *BKE_mesh_wrapper_from_editmesh_with_coords(BMEditMesh *em, const CustomData_MeshMasks *cd_mask_extra, - float (*vertexCos)[3], + const float (*vert_coords)[3], const Mesh *me_settings) { Mesh *me = BKE_id_new_nomain(ID_ME, NULL); @@ -83,7 +83,7 @@ Mesh *BKE_mesh_wrapper_from_editmesh_with_coords(BMEditMesh *em, #endif EditMeshData *edit_data = me->runtime.edit_data; - edit_data->vertexCos = vertexCos; + edit_data->vertexCos = vert_coords; return me; } diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index d4b7d05c228..7c77746ea1c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -878,10 +878,7 @@ void BKE_modifier_free_temporary_data(ModifierData *md) if (md->type == eModifierType_Armature) { ArmatureModifierData *amd = (ArmatureModifierData *)md; - if (amd->prevCos) { - MEM_freeN(amd->prevCos); - amd->prevCos = NULL; - } + MEM_SAFE_FREE(amd->vert_coords_prev); } } |