[Bf-blender-cvs] [86635402d51] blender2.8: Mesh: remove derivedFinal from various places

[Campbell Barton]

Commit: 86635402d516be80acbf4116c507968e214de690
Author: Campbell Barton
Date:   Fri Oct 12 19:22:34 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB86635402d516be80acbf4116c507968e214de690

Mesh: remove derivedFinal from various places

===================================================================

M	source/blender/blenkernel/intern/object.c
M	source/blender/editors/mesh/editmesh_knife_project.c
M	source/blender/editors/sculpt_paint/paint_vertex.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index b1d994b6e18..cd564238a20 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3753,12 +3753,12 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
 			Mesh *me = ob->data;
 			unsigned int i;
 
-			DerivedMesh *dm = ob->derivedDeform ? ob->derivedDeform : ob->derivedFinal;
+			Mesh *me_eval = ob->runtime.mesh_deform_eval ? ob->runtime.mesh_deform_eval : ob->runtime.mesh_deform_eval;
 			const int *index;
 
-			if (dm && (index = CustomData_get_layer(&dm->vertData, CD_ORIGINDEX))) {
-				MVert *mvert = dm->getVertArray(dm);
-				unsigned int totvert = dm->getNumVerts(dm);
+			if (me_eval && (index = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX))) {
+				MVert *mvert = me_eval->mvert;
+				uint totvert = me_eval->totvert;
 
 				/* tree over-allocs in case where some verts have ORIGINDEX_NONE */
 				tot = 0;
diff --git a/source/blender/editors/mesh/editmesh_knife_project.c b/source/blender/editors/mesh/editmesh_knife_project.c
index 5ccbcf063ad..da8b8d217d7 100644
--- a/source/blender/editors/mesh/editmesh_knife_project.c
+++ b/source/blender/editors/mesh/editmesh_knife_project.c
@@ -66,7 +66,7 @@ static LinkNode *knifeproject_poly_from_object(const bContext *C, Scene *scene,
 	struct Mesh *me_eval;
 	bool me_eval_needs_free;
 
-	if (ob->type == OB_MESH || ob->derivedFinal) {
+	if (ob->type == OB_MESH || ob->runtime.mesh_eval) {
 		me_eval = (ob->runtime.mesh_eval ?
 		           ob->runtime.mesh_eval : mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_BAREMESH));
 		me_eval_needs_free = false;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 139986fa1c1..7b3cfe184f5 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -173,12 +173,12 @@ static MDeformVert *defweight_prev_init(MDeformVert *dvert_prev, MDeformVert *dv
  * (without rebuilding the 'derivedFinal') */
 static bool vertex_paint_use_fast_update_check(Object *ob)
 {
-	DerivedMesh *dm = ob->derivedFinal;
+	Mesh *me_eval = ob->runtime.mesh_eval;
 
-	if (dm) {
+	if (me_eval != NULL) {
 		Mesh *me = BKE_mesh_from_object(ob);
 		if (me && me->mloopcol) {
-			return (me->mloopcol == CustomData_get_layer(&dm->loopData, CD_MLOOPCOL));
+			return (me->mloopcol == CustomData_get_layer(&me_eval->ldata, CD_MLOOPCOL));
 		}
 	}