diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 10:05:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-17 10:05:18 +0300 |
| commit | e0e6229176573484431d2bbf3ba0c2f849522789 (patch) | |
| tree | bdf220c75443dfa2e5f5a4f59c1a380044a443cf /source/blender/blenkernel/intern/object_dupli.c | |
| parent | 203b964ff4da6f4c6cd54937e0dd704ff1cfc7b0 (diff) | |
Cleanup: rename Mesh.edit_btmesh -> edit_mesh
When bmesh was in a branch we had both edit_mesh and edit_btmesh,
now there is no reason to use this odd name.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 22402a6a206..db6855ccaf3 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -305,7 +305,7 @@ static const DupliGenerator gen_dupli_collection = { /* OB_DUPLIVERTS */ typedef struct VertexDupliData { Mesh *me_eval; - BMEditMesh *edit_btmesh; + BMEditMesh *edit_mesh; int totvert; float (*orco)[3]; bool use_rotation; @@ -396,14 +396,14 @@ static void make_duplis_verts(const DupliContext *ctx) /* gather mesh info */ { - vdd.edit_btmesh = BKE_editmesh_from_object(parent); + vdd.edit_mesh = BKE_editmesh_from_object(parent); /* We do not need any render-specific handling anymore, depsgraph takes care of that. */ /* NOTE: Do direct access to the evaluated mesh: this function is used * during meta balls evaluation. But even without those all the objects * which are needed for correct instancing are already evaluated. */ - if (vdd.edit_btmesh != NULL) { - vdd.me_eval = vdd.edit_btmesh->mesh_eval_cage; + if (vdd.edit_mesh != NULL) { + vdd.me_eval = vdd.edit_mesh->mesh_eval_cage; } else { vdd.me_eval = parent->runtime.mesh_eval; |