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
path: root/source/blender/editors/object
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_bake_api.c6
-rw-r--r--source/blender/editors/object/object_modifier.cc6
-rw-r--r--source/blender/editors/object/object_remesh.cc4
-rw-r--r--source/blender/editors/object/object_vgroup.cc24
4 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 2e07214a5b3..8db699cceb8 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1028,8 +1028,8 @@ static void bake_targets_populate_pixels_color_attributes(BakeTargets *targets,
const MLoop *loops = BKE_mesh_loops(me_eval);
BKE_mesh_recalc_looptri(loops,
- BKE_mesh_polygons(me_eval),
- BKE_mesh_vertices(me_eval),
+ BKE_mesh_polys(me_eval),
+ BKE_mesh_verts(me_eval),
me_eval->totloop,
me_eval->totpoly,
looptri);
@@ -1037,7 +1037,7 @@ static void bake_targets_populate_pixels_color_attributes(BakeTargets *targets,
/* For mapping back to original mesh in case there are modifiers. */
const int *vert_origindex = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX);
const int *poly_origindex = CustomData_get_layer(&me_eval->pdata, CD_ORIGINDEX);
- const MPoly *orig_polys = BKE_mesh_polygons(me);
+ const MPoly *orig_polys = BKE_mesh_polys(me);
const MLoop *orig_loops = BKE_mesh_loops(me);
for (int i = 0; i < tottri; i++) {
diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc
index 5e642a00727..8bbceccab28 100644
--- a/source/blender/editors/object/object_modifier.cc
+++ b/source/blender/editors/object/object_modifier.cc
@@ -593,7 +593,7 @@ bool ED_object_modifier_convert_psys_to_mesh(ReportList *UNUSED(reports),
CustomData_add_layer(&me->edata, CD_MEDGE, CD_SET_DEFAULT, nullptr, edges_num);
CustomData_add_layer(&me->fdata, CD_MFACE, CD_SET_DEFAULT, nullptr, 0);
- blender::MutableSpan<MVert> verts = me->vertices_for_write();
+ blender::MutableSpan<MVert> verts = me->verts_for_write();
blender::MutableSpan<MEdge> edges = me->edges_for_write();
MVert *mvert = verts.data();
MEdge *medge = edges.data();
@@ -2639,7 +2639,7 @@ static void skin_armature_bone_create(Object *skin_ob,
static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, Object *skin_ob)
{
Mesh *me = static_cast<Mesh *>(skin_ob->data);
- const Span<MVert> me_verts = me->vertices();
+ const Span<MVert> me_verts = me->verts();
const Span<MEdge> me_edges = me->edges();
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
@@ -2647,7 +2647,7 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain,
const Mesh *me_eval_deform = mesh_get_eval_deform(
depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH);
- const Span<MVert> verts_eval = me_eval_deform->vertices();
+ const Span<MVert> verts_eval = me_eval_deform->verts();
/* add vertex weights to original mesh */
CustomData_add_layer(&me->vdata, CD_MDEFORMVERT, CD_SET_DEFAULT, nullptr, me->totvert);
diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc
index 56cccd984b6..c93d7dc3ee5 100644
--- a/source/blender/editors/object/object_remesh.cc
+++ b/source/blender/editors/object/object_remesh.cc
@@ -131,7 +131,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
}
/* Output mesh will be all smooth or all flat shading. */
- const Span<MPoly> polygons = mesh->polygons();
+ const Span<MPoly> polygons = mesh->polys();
const bool smooth_normals = polygons.first().flag & ME_SMOOTH;
float isovalue = 0.0f;
@@ -682,7 +682,7 @@ static bool mesh_is_manifold_consistent(Mesh *mesh)
* check that the direction of the faces are consistent and doesn't suddenly
* flip
*/
- const Span<MVert> verts = mesh->vertices();
+ const Span<MVert> verts = mesh->verts();
const Span<MEdge> edges = mesh->edges();
const Span<MLoop> loops = mesh->loops();
diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc
index 19c26edfb05..d2cb7ad4b43 100644
--- a/source/blender/editors/object/object_vgroup.cc
+++ b/source/blender/editors/object/object_vgroup.cc
@@ -200,7 +200,7 @@ bool ED_vgroup_parray_alloc(ID *id,
return true;
}
if (!me->deform_verts().is_empty()) {
- const Span<MVert> verts = me->vertices();
+ const Span<MVert> verts = me->verts();
MutableSpan<MDeformVert> dverts = me->deform_verts_for_write();
*dvert_tot = me->totvert;
@@ -663,7 +663,7 @@ static void vgroup_copy_active_to_sel(Object *ob, eVGroupSelect subset_type)
}
}
else {
- const Span<MVert> verts = me->vertices();
+ const Span<MVert> verts = me->verts();
int v_act;
dvert_act = ED_mesh_active_dvert_get_ob(ob, &v_act);
@@ -1056,7 +1056,7 @@ static void vgroup_select_verts(Object *ob, int select)
MVert *mv;
int i;
- mv = me->vertices_for_write().data();
+ mv = me->verts_for_write().data();
for (i = 0; i < me->totvert; i++, mv++) {
if (!(hide_vert != nullptr && hide_vert[i])) {
@@ -1218,7 +1218,7 @@ static bool vgroup_normalize(Object *ob)
* count is an int passed by reference so it can be assigned the value of the length here. */
static blender::Vector<int> getSurroundingVerts(Mesh *me, int vert)
{
- const MPoly *mp = me->polygons().data();
+ const MPoly *mp = me->polys().data();
const MLoop *loops = me->loops().data();
int i = me->totpoly;
@@ -1377,7 +1377,7 @@ static void moveCloserToDistanceFromPlane(Depsgraph *depsgraph,
do {
wasChange = false;
me_deform = mesh_get_eval_deform(depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH);
- const Span<MVert> verts = me_deform->vertices();
+ const Span<MVert> verts = me_deform->verts();
m = verts[index];
copy_v3_v3(oldPos, m.co);
distToStart = dot_v3v3(norm, oldPos) + d;
@@ -1525,7 +1525,7 @@ static void vgroup_fix(
int i;
Mesh *me = static_cast<Mesh *>(ob->data);
- MVert *mvert = me->vertices_for_write().data();
+ MVert *mvert = me->verts_for_write().data();
if (!(me->editflag & ME_EDIT_PAINT_VERT_SEL)) {
return;
}
@@ -1540,7 +1540,7 @@ static void vgroup_fix(
Mesh *me_deform = mesh_get_eval_deform(
depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH);
- const Span<MVert> verts_deform = me_deform->vertices();
+ const Span<MVert> verts_deform = me_deform->verts();
k = count;
while (k--) {
p[k] = verts_deform[verts[k]];
@@ -1975,7 +1975,7 @@ static void vgroup_smooth_subset(Object *ob,
}
}
else {
- const Span<MVert> verts = me->vertices();
+ const Span<MVert> verts = me->verts();
const blender::Span<MEdge> edges = me->edges();
for (int i = 0; i < dvert_tot; i++) {
const MVert *v = &verts[i];
@@ -2053,7 +2053,7 @@ static void vgroup_smooth_subset(Object *ob,
const blender::Span<MEdge> edges = me->edges();
/* checked already */
- BLI_assert(IS_ME_VERT_WRITE(&me->vertices()[i]));
+ BLI_assert(IS_ME_VERT_WRITE(&me->verts()[i]));
for (j = 0; j < emap[i].count; j++) {
const MEdge *e = &edges[emap[i].indices[j]];
@@ -2471,7 +2471,7 @@ void ED_vgroup_mirror(Object *ob,
}
BLI_bitmap *vert_tag = BLI_BITMAP_NEW(me->totvert, __func__);
- const MVert *verts = me->vertices().data();
+ const MVert *verts = me->verts().data();
MutableSpan<MDeformVert> dverts = me->deform_verts_for_write();
for (vidx = 0, mv = verts; vidx < me->totvert; vidx++, mv++) {
@@ -2625,7 +2625,7 @@ static void vgroup_assign_verts(Object *ob, const float weight)
}
}
else {
- const Span<MVert> verts = me->vertices();
+ const Span<MVert> verts = me->verts();
MutableSpan<MDeformVert> dverts = me->deform_verts_for_write();
MDeformVert *dv = dverts.data();
@@ -4356,7 +4356,7 @@ static void vgroup_copy_active_to_sel_single(Object *ob, const int def_nr)
return;
}
- const Span<MVert> verts = me->vertices();
+ const Span<MVert> verts = me->verts();
MutableSpan<MDeformVert> dverts = me->deform_verts_for_write();
dv = dverts.data();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 10:18:02 +0300