[Bf-blender-cvs] [529f865588d] temp-modifier-rm-cddm: Consistent naming
Sybren A. Stüvel
noreply at git.blender.org
Wed Apr 25 11:45:30 CEST 2018
Commit: 529f865588db3b62d699ed3781f9492e16d1e939
Author: Sybren A. Stüvel
Date: Wed Apr 25 11:41:29 2018 +0200
Branches: temp-modifier-rm-cddm
https://developer.blender.org/rB529f865588db3b62d699ed3781f9492e16d1e939
Consistent naming
===================================================================
M source/blender/blenkernel/intern/modifier.c
===================================================================
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index c95ed3bcd8f..f7892e2f08b 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -1006,18 +1006,18 @@ void modifier_deformVerts_DM_deprecated(struct ModifierData *md, struct Depsgrap
}
else {
/* TODO(sybren): deduplicate all the copies of this code in this file. */
- Mesh *new_mesh = NULL;
+ Mesh *mesh = NULL;
if (dm != NULL) {
- new_mesh = BKE_libblock_alloc_notest(ID_ME);
- BKE_mesh_init(new_mesh);
- DM_to_mesh(dm, new_mesh, ob, CD_MASK_EVERYTHING, false);
+ mesh = BKE_libblock_alloc_notest(ID_ME);
+ BKE_mesh_init(mesh);
+ DM_to_mesh(dm, mesh, ob, CD_MASK_EVERYTHING, false);
}
- mti->deformVerts(md, depsgraph, ob, new_mesh, vertexCos, numVerts, flag);
+ mti->deformVerts(md, depsgraph, ob, mesh, vertexCos, numVerts, flag);
- if (new_mesh != NULL) {
- BKE_mesh_free(new_mesh);
- MEM_freeN(new_mesh);
+ if (mesh != NULL) {
+ BKE_mesh_free(mesh);
+ MEM_freeN(mesh);
}
}
}
More information about the Bf-blender-cvs
mailing list