[93ce0a7c48d] temp-modifier-rm-cddm: Mesh *to_use â mesh_src
Sybren A. Stüvel
noreply at git.blender.org
Tue May 1 14:55:22 CEST 2018
Commit: 93ce0a7c48d94be9435ebbf4f809d94dd66019d3
Author: Sybren A. Stüvel
Date: Tue May 1 14:55:19 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB93ce0a7c48d94be9435ebbf4f809d94dd66019d3
Mesh *to_use → mesh_src
===================================================================
M source/blender/modifiers/intern/MOD_armature.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c
index 86245ffa763..f354ed3aada 100644
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@ -167,22 +167,22 @@ static void deformMatricesEM(
float (*defMats)[3][3], int numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;
- Mesh *to_use = mesh;
+ Mesh *mesh_src = mesh;
/* TODO(sybren): possibly lift this code to modifier.c and use it for all modifiers */
if (!mesh) {
struct BMeshToMeshParams params = {0};
- to_use = BKE_libblock_alloc_notest(ID_ME);
- BKE_mesh_init(to_use);
- BM_mesh_bm_to_me(em->bm, to_use, ¶ms);
+ mesh_src = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(mesh_src);
+ BM_mesh_bm_to_me(em->bm, mesh_src, ¶ms);
}
- armature_deform_verts(amd->object, ctx->object, to_use, vertexCos, defMats, numVerts,
+ armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts,
amd->deformflag, NULL, amd->defgrp_name);
if (!mesh) {
- BKE_mesh_free(to_use);
- MEM_freeN(to_use);
+ BKE_mesh_free(mesh_src);
+ MEM_freeN(mesh_src);
}
}
@@ -190,9 +190,9 @@ static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Mes
float (*vertexCos)[3], float (*defMats)[3][3], int numVerts)
{
ArmatureModifierData *amd = (ArmatureModifierData *) md;
- Mesh *to_use = mesh ? mesh : ctx->object->data;
+ Mesh *mesh_src = mesh ? mesh : ctx->object->data;
- armature_deform_verts(amd->object, ctx->object, to_use, vertexCos, defMats, numVerts,
+ armature_deform_verts(amd->object, ctx->object, mesh_src, vertexCos, defMats, numVerts,
amd->deformflag, NULL, amd->defgrp_name);
}
More information about the Bf-blender-cvs
mailing list