diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_mesh.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index f63d91d5943..c36e53a49cd 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -348,7 +348,7 @@ static int rna_MeshVertex_index_get(PointerRNA *ptr) { const Mesh *mesh = rna_mesh(ptr); const MVert *vert = (MVert *)ptr->data; - const int index = (int)(vert - BKE_mesh_vertices(mesh)); + const int index = (int)(vert - BKE_mesh_verts(mesh)); BLI_assert(index >= 0); BLI_assert(index < mesh->totvert); return index; @@ -368,7 +368,7 @@ static int rna_MeshPolygon_index_get(PointerRNA *ptr) { const Mesh *mesh = rna_mesh(ptr); const MPoly *mpoly = (MPoly *)ptr->data; - const int index = (int)(mpoly - BKE_mesh_polygons(mesh)); + const int index = (int)(mpoly - BKE_mesh_polys(mesh)); BLI_assert(index >= 0); BLI_assert(index < mesh->totpoly); return index; @@ -532,7 +532,7 @@ static void rna_MeshPolygon_normal_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); BKE_mesh_calc_poly_normal(mp, loops + mp->loopstart, verts, values); } @@ -583,7 +583,7 @@ static void rna_MeshPolygon_center_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); BKE_mesh_calc_poly_center(mp, loops + mp->loopstart, verts, values); } @@ -592,7 +592,7 @@ static float rna_MeshPolygon_area_get(PointerRNA *ptr) { Mesh *me = (Mesh *)ptr->owner_id; MPoly *mp = (MPoly *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); return BKE_mesh_calc_poly_area(mp, loops + mp->loopstart, verts); } @@ -621,7 +621,7 @@ static void rna_MeshLoopTriangle_normal_get(PointerRNA *ptr, float *values) { Mesh *me = rna_mesh(ptr); MLoopTri *lt = (MLoopTri *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); unsigned int v1 = loops[lt->tri[0]].v; unsigned int v2 = loops[lt->tri[1]].v; @@ -652,7 +652,7 @@ static float rna_MeshLoopTriangle_area_get(PointerRNA *ptr) { Mesh *me = rna_mesh(ptr); MLoopTri *lt = (MLoopTri *)ptr->data; - const MVert *verts = BKE_mesh_vertices(me); + const MVert *verts = BKE_mesh_verts(me); const MLoop *loops = BKE_mesh_loops(me); unsigned int v1 = loops[lt->tri[0]].v; unsigned int v2 = loops[lt->tri[1]].v; @@ -1335,7 +1335,7 @@ static bool rna_MeshLoopTriangle_use_smooth_get(PointerRNA *ptr) { const Mesh *me = rna_mesh(ptr); const MLoopTri *ltri = (MLoopTri *)ptr->data; - const MPoly *polys = BKE_mesh_polygons(me); + const MPoly *polys = BKE_mesh_polys(me); return polys[ltri->poly].flag & ME_SMOOTH; } @@ -1452,7 +1452,7 @@ static void rna_Mesh_vertices_begin(CollectionPropertyIterator *iter, PointerRNA { Mesh *mesh = rna_mesh(ptr); rna_iterator_array_begin( - iter, BKE_mesh_vertices_for_write(mesh), sizeof(MVert), mesh->totvert, false, NULL); + iter, BKE_mesh_verts_for_write(mesh), sizeof(MVert), mesh->totvert, false, NULL); } static int rna_Mesh_vertices_length(PointerRNA *ptr) { @@ -1467,7 +1467,7 @@ int rna_Mesh_vertices_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr) } r_ptr->owner_id = &mesh->id; r_ptr->type = &RNA_MeshVertex; - r_ptr->data = &BKE_mesh_vertices_for_write(mesh)[index]; + r_ptr->data = &BKE_mesh_verts_for_write(mesh)[index]; return true; } @@ -1498,7 +1498,7 @@ static void rna_Mesh_polygons_begin(CollectionPropertyIterator *iter, PointerRNA { Mesh *mesh = rna_mesh(ptr); rna_iterator_array_begin( - iter, BKE_mesh_polygons_for_write(mesh), sizeof(MPoly), mesh->totpoly, false, NULL); + iter, BKE_mesh_polys_for_write(mesh), sizeof(MPoly), mesh->totpoly, false, NULL); } static int rna_Mesh_polygons_length(PointerRNA *ptr) { @@ -1513,7 +1513,7 @@ int rna_Mesh_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr) } r_ptr->owner_id = &mesh->id; r_ptr->type = &RNA_MeshPolygon; - r_ptr->data = &BKE_mesh_polygons_for_write(mesh)[index]; + r_ptr->data = &BKE_mesh_polys_for_write(mesh)[index]; return true; } |