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/draw/modes | |
| 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/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/edit_mesh_mode_text.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/modes/overlay_mode.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 420c099ee09..7d50d9a7fab 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -545,7 +545,7 @@ static void edit_mesh_add_ob_to_pass( bool has_edit_mesh_cage = false; /* TODO: Should be its own function. */ Mesh *me = (Mesh *)ob->data; - BMEditMesh *embm = me->edit_btmesh; + BMEditMesh *embm = me->edit_mesh; if (embm) { has_edit_mesh_cage = embm->mesh_eval_cage && (embm->mesh_eval_cage != embm->mesh_eval_final); } diff --git a/source/blender/draw/modes/edit_mesh_mode_text.c b/source/blender/draw/modes/edit_mesh_mode_text.c index 81e6dd56275..a0b6cef594f 100644 --- a/source/blender/draw/modes/edit_mesh_mode_text.c +++ b/source/blender/draw/modes/edit_mesh_mode_text.c @@ -51,7 +51,7 @@ void DRW_edit_mesh_mode_text_measure_stats( struct DRWTextStore *dt = DRW_text_cache_ensure(); const short txt_flag = DRW_TEXT_CACHE_GLOBALSPACE | (unit->system ? 0 : DRW_TEXT_CACHE_ASCII); Mesh *me = ob->data; - BMEditMesh *em = me->edit_btmesh; + BMEditMesh *em = me->edit_mesh; float v1[3], v2[3], v3[3], vmid[3], fvec[3]; char numstr[32]; /* Stores the measurement display text here */ size_t numstr_len; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 7e9dde4f210..5921fcf9960 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2961,7 +2961,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) bool has_edit_mesh_cage = false; /* TODO: Should be its own function. */ if (is_edit_mode) { - BMEditMesh *embm = me->edit_btmesh; + BMEditMesh *embm = me->edit_mesh; has_edit_mesh_cage = embm->mesh_eval_cage && (embm->mesh_eval_cage != embm->mesh_eval_final); } if (!is_edit_mode || diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c index 407c22bf581..5f475b35d56 100644 --- a/source/blender/draw/modes/overlay_mode.c +++ b/source/blender/draw/modes/overlay_mode.c @@ -253,7 +253,7 @@ static void overlay_cache_populate(void *vedata, Object *ob) if (ob->type == OB_MESH) { /* TODO: Should be its own function. */ Mesh *me = (Mesh *)ob->data; - BMEditMesh *embm = me->edit_btmesh; + BMEditMesh *embm = me->edit_mesh; if (embm) { has_edit_mesh_cage = embm->mesh_eval_cage && (embm->mesh_eval_cage != embm->mesh_eval_final); } |