Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-17 10:05:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-17 10:05:18 +0300
commite0e6229176573484431d2bbf3ba0c2f849522789 (patch)
treebdf220c75443dfa2e5f5a4f59c1a380044a443cf /source/blender/blenkernel/intern/DerivedMesh.c
parent203b964ff4da6f4c6cd54937e0dd704ff1cfc7b0 (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/DerivedMesh.c')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index d31fb72e4a0..51d9763a01e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1909,11 +1909,11 @@ static void editbmesh_calc_modifiers(
* check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential
* but quiets annoying error messages since tessfaces wont be created. */
if (dataMask & CD_MASK_MFACE) {
- if ((*r_final)->edit_btmesh == NULL) {
+ if ((*r_final)->edit_mesh == NULL) {
BKE_mesh_tessface_ensure(*r_final);
}
if (r_cage && *r_cage) {
- if ((*r_cage)->edit_btmesh == NULL) {
+ if ((*r_cage)->edit_mesh == NULL) {
if (*r_cage != *r_final) {
BKE_mesh_tessface_ensure(*r_cage);
}
@@ -1971,7 +1971,7 @@ static void mesh_finalize_eval(Object *object)
/* Make evaluated mesh to share same edit mesh pointer as original
* and copied meshes.
*/
- mesh_eval->edit_btmesh = mesh->edit_btmesh;
+ mesh_eval->edit_mesh = mesh->edit_mesh;
/* Copy autosmooth settings from original mesh.
* This is not done by BKE_mesh_new_nomain_from_template(), so need to take
* extra care here.