diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 08:31:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-22 08:39:16 +0300 |
commit | ac476375b1755c994cc7d160bba827e4aed73597 (patch) | |
tree | e584b51e5f38dd0c26a68d199270dc4463a0f58f /source/blender/blenkernel/intern/lattice.c | |
parent | 67cf4cb5ec1e0f964fe41fa6aae80ffceedbf939 (diff) |
Cleanup: style, whitespace
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 3257b20291d..d7105d3423f 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -1025,7 +1025,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec { Lattice *lt = ob->data; /* Get vertex coordinates from the original copy; otherwise we get already-modified coordinates. */ - Object *orig_ob = DEG_get_original_object(ob); + Object *ob_orig = DEG_get_original_object(ob); VirtualModifierData virtualModifierData; ModifierData *md = modifiers_getVirtualModifierList(ob, &virtualModifierData); float (*vertexCos)[3] = NULL; @@ -1050,7 +1050,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec if (mti->isDisabled && mti->isDisabled(md, 0)) continue; if (mti->type != eModifierTypeType_OnlyDeform) continue; - if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob, &numVerts); + if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob_orig, &numVerts); modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts); } @@ -1062,7 +1062,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec } else { /* Displist won't do anything; this is just for posterity's sake until we remove it. */ - if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(orig_ob, &numVerts); + if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob_orig, &numVerts); DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl"); dl->type = DL_VERTS; |