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:
authorHans Goudey <h.goudey@me.com>2022-09-12 05:11:52 +0300
committerHans Goudey <h.goudey@me.com>2022-09-12 05:11:52 +0300
commitc8808542d0365877e1345a708931320ffe71b098 (patch)
tree60e18cf1050b2609e998e83481e68de78bfdebc8 /source/blender/blenkernel/intern/DerivedMesh.cc
parent0aeb1f0c5bb95be426d96a5ad9924610d909899d (diff)
Remove most uses of CD_MVERT
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.cc')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index 72f804dcb4c..dda9ee20e58 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -91,18 +91,19 @@ static void editbmesh_calc_modifier_final_normals_or_defer(
/* -------------------------------------------------------------------- */
-static MVert *dm_getVertArray(DerivedMesh *dm)
+static float (*dm_getVertArray(DerivedMesh *dm))[3]
{
- MVert *mvert = (MVert *)CustomData_get_layer(&dm->vertData, CD_MVERT);
+ float(*positions)[3] = (float(*)[3])CustomData_get_layer_named(
+ &dm->vertData, CD_PROP_FLOAT3, "position");
- if (!mvert) {
- mvert = (MVert *)CustomData_add_layer(
- &dm->vertData, CD_MVERT, CD_SET_DEFAULT, nullptr, dm->getNumVerts(dm));
- CustomData_set_layer_flag(&dm->vertData, CD_MVERT, CD_FLAG_TEMPORARY);
- dm->copyVertArray(dm, mvert);
+ if (!positions) {
+ positions = (float(*)[3])CustomData_add_layer_named(
+ &dm->vertData, CD_PROP_FLOAT3, CD_SET_DEFAULT, nullptr, dm->getNumVerts(dm), "position");
+ CustomData_set_layer_flag(&dm->vertData, CD_PROP_FLOAT3, CD_FLAG_TEMPORARY);
+ dm->copyVertArray(dm, positions);
}
- return mvert;
+ return positions;
}
static MEdge *dm_getEdgeArray(DerivedMesh *dm)