[Bf-blender-cvs] [e65d7665f19] blender2.8: Removed most calls to modifier_deformVerts_DM_deprecated()

Sybren A. Stüvel noreply at git.blender.org
Thu Jun 28 16:01:10 CEST 2018


Commit: e65d7665f19b9e240399bed5ed574fc9bdcf41af
Author: Sybren A. Stüvel
Date:   Thu Jun 28 16:01:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe65d7665f19b9e240399bed5ed574fc9bdcf41af

Removed most calls to modifier_deformVerts_DM_deprecated()

None of those calls actually passed a DerivedMesh.

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

M	source/blender/blenkernel/intern/crazyspace.c
M	source/blender/blenkernel/intern/displist.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c
index 0a31411d638..2b4daae503d 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -404,7 +404,7 @@ void BKE_crazyspace_build_sculpt(struct Depsgraph *depsgraph, Scene *scene, Obje
 				if ((mti->deformMatrices || mti->deformMatrices_DM) && !deformed)
 					continue;
 
-				modifier_deformVerts_DM_deprecated(md, &mectx, NULL, deformedVerts, me->totvert);
+				modifier_deformVerts(md, &mectx, NULL, deformedVerts, me->totvert);
 				deformed = 1;
 			}
 		}
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 84bac76202a..34fd32b2908 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -864,7 +864,7 @@ static void curve_calc_modifiers_pre(
 				deformedVerts = BKE_curve_nurbs_vertexCos_get(nurb, &numVerts);
 			}
 
-			modifier_deformVerts_DM_deprecated(md, &mectx, NULL, deformedVerts, numVerts);
+			modifier_deformVerts(md, &mectx, NULL, deformedVerts, numVerts);
 
 			if (md == pretessellatePoint)
 				break;
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 0af329449ca..78ff43c2981 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -1052,7 +1052,7 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec
 		if (mti->type != eModifierTypeType_OnlyDeform) continue;
 
 		if (!vertexCos) vertexCos = BKE_lattice_vertexcos_get(ob_orig, &numVerts);
-		modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts);
+		modifier_deformVerts(md, &mectx, NULL, vertexCos, numVerts);
 	}
 
 	if (ob->id.tag & LIB_TAG_COPIED_ON_WRITE) {
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index 9d7ca44ce16..d24cc936ec1 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -638,7 +638,7 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen
 		BKE_report(reports, RPT_INFO, "Applied modifier only changed CV points, not tessellated/bevel vertices");
 
 		vertexCos = BKE_curve_nurbs_vertexCos_get(&cu->nurb, &numVerts);
-		modifier_deformVerts_DM_deprecated(md, &mectx, NULL, vertexCos, numVerts);
+		modifier_deformVerts(md, &mectx, NULL, vertexCos, numVerts);
 		BK_curve_nurbs_vertexCos_apply(&cu->nurb, vertexCos);
 
 		MEM_freeN(vertexCos);



More information about the Bf-blender-cvs mailing list