Cleanup: Naming, match policy with rest of copy-on-write design

2 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index efce92f884e..87417ccc6b0 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -341,15 +341,15 @@ void BKE_object_free_derived_caches(Object *ob)
 		ob->derivedDeform = NULL;
 	}
 
-	if (ob->mesh_evaluated != NULL) {
+	if (ob->mesh_eval != NULL) {
 		/* Restore initial pointer. */
-		ob->data = ob->mesh_evaluated->id.orig_id;
+		ob->data = ob->mesh_eval->id.orig_id;
 		/* Evaluated mesh points to edit mesh, but does not own it. */
-		ob->mesh_evaluated->edit_btmesh = NULL;
-		BKE_mesh_free(ob->mesh_evaluated);
-		BKE_libblock_free_data(&ob->mesh_evaluated->id, false);
-		MEM_freeN(ob->mesh_evaluated);
-		ob->mesh_evaluated = NULL;
+		ob->mesh_eval->edit_btmesh = NULL;
+		BKE_mesh_free(ob->mesh_eval);
+		BKE_libblock_free_data(&ob->mesh_eval->id, false);
+		MEM_freeN(ob->mesh_eval);
+		ob->mesh_eval = NULL;
 	}
 
 	BKE_object_free_curve_cache(ob);
@@ -2814,7 +2814,7 @@ Mesh *BKE_object_get_evaluated_mesh(const Depsgraph *depsgraph, Object *ob)
 {
 	Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
 
-	return ob_eval->mesh_evaluated;
+	return ob_eval->mesh_eval;
 }
 
 
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 1778eaeae75..0709d01d5ac 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -350,7 +350,7 @@ void BKE_object_eval_uber_data(Depsgraph *depsgraph,
 				 * explicit  way to query final object evaluated data and know for sure
 				 * who owns the newly created mesh datablock.
 				 */
-				ob->mesh_evaluated = new_mesh;
+				ob->mesh_eval = new_mesh;
 				/* TODO(sergey): This is kind of compatibility thing, so all render
 				 * engines can use object->data for mesh data for display. This is
 				 * something what we might want to change in the future.