forked from bartvdbraak/blender
code cleanup: name mesh functions more consistently, also use bools for mesh args.
This commit is contained in:
parent
09c41019a8
commit
3dababa7ec
@ -81,7 +81,7 @@ struct BMesh *BKE_mesh_to_bmesh(struct Mesh *me, struct Object *ob);
|
||||
int BKE_mesh_recalc_tessellation(struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
|
||||
struct MVert *mvert,
|
||||
int totface, int totloop, int totpoly,
|
||||
const int do_face_normals);
|
||||
const bool do_face_normals);
|
||||
|
||||
/* for forwards compat only quad->tri polys to mface, skip ngons.
|
||||
*/
|
||||
@ -150,7 +150,7 @@ void BKE_mesh_free(struct Mesh *me, int unlink);
|
||||
struct Mesh *BKE_mesh_add(struct Main *bmain, const char *name);
|
||||
struct Mesh *BKE_mesh_copy_ex(struct Main *bmain, struct Mesh *me);
|
||||
struct Mesh *BKE_mesh_copy(struct Mesh *me);
|
||||
void mesh_update_customdata_pointers(struct Mesh *me, const short do_ensure_tess_cd);
|
||||
void BKE_mesh_update_customdata_pointers(struct Mesh *me, const bool do_ensure_tess_cd);
|
||||
|
||||
void BKE_mesh_make_local(struct Mesh *me);
|
||||
void BKE_mesh_boundbox_calc(struct Mesh *me, float r_loc[3], float r_size[3]);
|
||||
@ -159,7 +159,7 @@ float (*BKE_mesh_orco_verts_get(struct Object *ob))[3];
|
||||
void BKE_mesh_orco_verts_transform(struct Mesh *me, float (*orco)[3], int totvert, int invert);
|
||||
int test_index_face(struct MFace *mface, struct CustomData *mfdata, int mfindex, int nr);
|
||||
struct Mesh *BKE_mesh_from_object(struct Object *ob);
|
||||
void set_mesh(struct Object *ob, struct Mesh *me);
|
||||
void BKE_mesh_assign_object(struct Object *ob, struct Mesh *me);
|
||||
void BKE_mesh_from_metaball(struct ListBase *lb, struct Mesh *me);
|
||||
int BKE_mesh_nurbs_to_mdata(struct Object *ob, struct MVert **allvert, int *totvert,
|
||||
struct MEdge **alledge, int *totedge, struct MLoop **allloop, struct MPoly **allpoly,
|
||||
@ -167,7 +167,7 @@ int BKE_mesh_nurbs_to_mdata(struct Object *ob, struct MVert **allvert, int *tot
|
||||
int BKE_mesh_nurbs_displist_to_mdata(struct Object *ob, struct ListBase *dispbase, struct MVert **allvert, int *_totvert,
|
||||
struct MEdge **alledge, int *_totedge, struct MLoop **allloop, struct MPoly **allpoly,
|
||||
struct MLoopUV **alluv, int *_totloop, int *_totpoly);
|
||||
void BKE_mesh_from_nurbs_displist(struct Object *ob, struct ListBase *dispbase, int use_orco_uv);
|
||||
void BKE_mesh_from_nurbs_displist(struct Object *ob, struct ListBase *dispbase, const bool use_orco_uv);
|
||||
void BKE_mesh_from_nurbs(struct Object *ob);
|
||||
void BKE_mesh_to_curve_nurblist(struct DerivedMesh *dm, struct ListBase *nurblist, const int edge_users_test);
|
||||
void BKE_mesh_to_curve(struct Scene *scene, struct Object *ob);
|
||||
@ -221,7 +221,7 @@ void BKE_mesh_calc_normals(
|
||||
|
||||
/* Return a newly MEM_malloc'd array of all the mesh vertex locations
|
||||
* (_numVerts_r_ may be NULL) */
|
||||
float (*mesh_getVertexCos(struct Mesh *me, int *numVerts_r))[3];
|
||||
float (*mesh_getVertexCos(struct Mesh *me, int *r_numVerts))[3];
|
||||
|
||||
/* map from uv vertex to face (for select linked, stitch, uv suburf) */
|
||||
|
||||
@ -280,7 +280,7 @@ typedef struct UvElementMap {
|
||||
* to make that many islands, he can bite me :p */
|
||||
#define INVALID_ISLAND 0xFFFF
|
||||
|
||||
UvVertMap *BKE_mesh_uv_vert_map_make(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv,
|
||||
UvVertMap *BKE_mesh_uv_vert_map_create(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv,
|
||||
unsigned int totpoly, unsigned int totvert, int selected, float *limit);
|
||||
UvMapVert *BKE_mesh_uv_vert_map_get_vert(UvVertMap *vmap, unsigned int v);
|
||||
void BKE_mesh_uv_vert_map_free(UvVertMap *vmap);
|
||||
@ -296,12 +296,12 @@ typedef struct IndexNode {
|
||||
int index;
|
||||
} IndexNode;
|
||||
|
||||
void create_vert_poly_map(MeshElemMap **map, int **mem,
|
||||
const struct MPoly *mface, const struct MLoop *mloop,
|
||||
int totvert, int totface, int totloop);
|
||||
void BKE_mesh_vert_poly_map_create(MeshElemMap **map, int **mem,
|
||||
const struct MPoly *mface, const struct MLoop *mloop,
|
||||
int totvert, int totface, int totloop);
|
||||
|
||||
void create_vert_edge_map(MeshElemMap **map, int **mem,
|
||||
const struct MEdge *medge, int totvert, int totedge);
|
||||
void BKE_mesh_vert_edge_map_create(MeshElemMap **map, int **mem,
|
||||
const struct MEdge *medge, int totvert, int totedge);
|
||||
|
||||
/* vertex level transformations & checks (no derived mesh) */
|
||||
|
||||
@ -309,7 +309,7 @@ int BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
|
||||
int BKE_mesh_center_median(struct Mesh *me, float cent[3]);
|
||||
int BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
|
||||
int BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
|
||||
void BKE_mesh_translate(struct Mesh *me, float offset[3], int do_keys);
|
||||
void BKE_mesh_translate(struct Mesh *me, const float offset[3], const bool do_keys);
|
||||
|
||||
/* mesh_validate.c */
|
||||
/* XXX Loop v/e are unsigned, so using max uint_32 value as invalid marker... */
|
||||
@ -322,8 +322,8 @@ int BKE_mesh_validate_arrays(
|
||||
struct MLoop *mloops, unsigned int totloop,
|
||||
struct MPoly *mpolys, unsigned int totpoly,
|
||||
struct MDeformVert *dverts, /* assume totvert length */
|
||||
const short do_verbose, const short do_fixes);
|
||||
int BKE_mesh_validate(struct Mesh *me, int do_verbose);
|
||||
const bool do_verbose, const bool do_fixes);
|
||||
int BKE_mesh_validate(struct Mesh *me, const int do_verbose);
|
||||
int BKE_mesh_validate_dm(struct DerivedMesh *dm);
|
||||
|
||||
void BKE_mesh_calc_edges(struct Mesh *mesh, bool update, const bool select);
|
||||
|
@ -542,7 +542,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob)
|
||||
}
|
||||
|
||||
/* yes, must be before _and_ after tessellate */
|
||||
mesh_update_customdata_pointers(&tmp, false);
|
||||
BKE_mesh_update_customdata_pointers(&tmp, false);
|
||||
|
||||
/* since 2.65 caller must do! */
|
||||
// BKE_mesh_tessface_calc(&tmp);
|
||||
|
@ -215,7 +215,7 @@ static const MeshElemMap *cdDM_getPolyMap(Object *ob, DerivedMesh *dm)
|
||||
if (!cddm->pmap && ob->type == OB_MESH) {
|
||||
Mesh *me = ob->data;
|
||||
|
||||
create_vert_poly_map(&cddm->pmap, &cddm->pmap_mem,
|
||||
BKE_mesh_vert_poly_map_create(&cddm->pmap, &cddm->pmap_mem,
|
||||
me->mpoly, me->mloop,
|
||||
me->totvert, me->totpoly, me->totloop);
|
||||
}
|
||||
|
@ -348,7 +348,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me)
|
||||
* note that for undo mesh data we want to skip 'ensure_tess_cd' call since
|
||||
* we don't want to store memory for tessface when its only used for older
|
||||
* versions of the mesh. - campbell*/
|
||||
static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_cd)
|
||||
static void mesh_update_linked_customdata(Mesh *me, const bool do_ensure_tess_cd)
|
||||
{
|
||||
if (me->edit_btmesh)
|
||||
BMEdit_UpdateLinkedCustomData(me->edit_btmesh);
|
||||
@ -360,7 +360,7 @@ static void mesh_update_linked_customdata(Mesh *me, const short do_ensure_tess_c
|
||||
CustomData_bmesh_update_active_layers(&me->fdata, &me->pdata, &me->ldata);
|
||||
}
|
||||
|
||||
void mesh_update_customdata_pointers(Mesh *me, const short do_ensure_tess_cd)
|
||||
void BKE_mesh_update_customdata_pointers(Mesh *me, const bool do_ensure_tess_cd)
|
||||
{
|
||||
mesh_update_linked_customdata(me, do_ensure_tess_cd);
|
||||
|
||||
@ -493,7 +493,7 @@ Mesh *BKE_mesh_copy_ex(Main *bmain, Mesh *me)
|
||||
mesh_tessface_clear_intern(men, FALSE);
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(men, do_tessface);
|
||||
BKE_mesh_update_customdata_pointers(men, do_tessface);
|
||||
|
||||
/* ensure indirect linked data becomes lib-extern */
|
||||
for (i = 0; i < me->fdata.totlayer; i++) {
|
||||
@ -622,7 +622,7 @@ void BKE_mesh_make_local(Mesh *me)
|
||||
for (ob = bmain->object.first; ob; ob = ob->id.next) {
|
||||
if (me == ob->data) {
|
||||
if (ob->id.lib == NULL) {
|
||||
set_mesh(ob, me_new);
|
||||
BKE_mesh_assign_object(ob, me_new);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -825,7 +825,7 @@ Mesh *BKE_mesh_from_object(Object *ob)
|
||||
else return NULL;
|
||||
}
|
||||
|
||||
void set_mesh(Object *ob, Mesh *me)
|
||||
void BKE_mesh_assign_object(Object *ob, Mesh *me)
|
||||
{
|
||||
Mesh *old = NULL;
|
||||
|
||||
@ -1194,7 +1194,7 @@ void BKE_mesh_from_metaball(ListBase *lb, Mesh *me)
|
||||
index += 4;
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
|
||||
BKE_mesh_calc_normals(me->mvert, me->totvert, me->mloop, me->mpoly, me->totloop, me->totpoly, NULL);
|
||||
|
||||
@ -1477,7 +1477,7 @@ int BKE_mesh_nurbs_displist_to_mdata(Object *ob, ListBase *dispbase,
|
||||
|
||||
|
||||
/* this may fail replacing ob->data, be sure to check ob->type */
|
||||
void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, int use_orco_uv)
|
||||
void BKE_mesh_from_nurbs_displist(Object *ob, ListBase *dispbase, const bool use_orco_uv)
|
||||
{
|
||||
Main *bmain = G.main;
|
||||
Object *ob1;
|
||||
@ -2063,7 +2063,7 @@ void BKE_mesh_convert_mfaces_to_mpolys(Mesh *mesh)
|
||||
mesh->medge, mesh->mface,
|
||||
&mesh->totloop, &mesh->totpoly, &mesh->mloop, &mesh->mpoly);
|
||||
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
}
|
||||
|
||||
/* the same as BKE_mesh_convert_mfaces_to_mpolys but oriented to be used in do_versions from readfile.c
|
||||
@ -2085,7 +2085,7 @@ void BKE_mesh_do_versions_convert_mfaces_to_mpolys(Mesh *mesh)
|
||||
|
||||
CustomData_bmesh_do_versions_update_active_layers(&mesh->fdata, &mesh->pdata, &mesh->ldata);
|
||||
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
}
|
||||
|
||||
void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData *ldata, CustomData *pdata,
|
||||
@ -2190,12 +2190,12 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(ID *id, CustomData *fdata, CustomData
|
||||
*mloop_r = mloop;
|
||||
}
|
||||
|
||||
float (*mesh_getVertexCos(Mesh * me, int *numVerts_r))[3]
|
||||
float (*mesh_getVertexCos(Mesh * me, int *r_numVerts))[3]
|
||||
{
|
||||
int i, numVerts = me->totvert;
|
||||
float (*cos)[3] = MEM_mallocN(sizeof(*cos) * numVerts, "vertexcos1");
|
||||
|
||||
if (numVerts_r) *numVerts_r = numVerts;
|
||||
if (r_numVerts) *r_numVerts = numVerts;
|
||||
for (i = 0; i < numVerts; i++)
|
||||
copy_v3_v3(cos[i], me->mvert[i].co);
|
||||
|
||||
@ -2207,7 +2207,8 @@ float (*mesh_getVertexCos(Mesh * me, int *numVerts_r))[3]
|
||||
/* this replaces the non bmesh function (in trunk) which takes MTFace's, if we ever need it back we could
|
||||
* but for now this replaces it because its unused. */
|
||||
|
||||
UvVertMap *BKE_mesh_uv_vert_map_make(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv, unsigned int totpoly, unsigned int totvert, int selected, float *limit)
|
||||
UvVertMap *BKE_mesh_uv_vert_map_create(struct MPoly *mpoly, struct MLoop *mloop, struct MLoopUV *mloopuv,
|
||||
unsigned int totpoly, unsigned int totvert, int selected, float *limit)
|
||||
{
|
||||
UvVertMap *vmap;
|
||||
UvMapVert *buf;
|
||||
@ -2315,9 +2316,9 @@ void BKE_mesh_uv_vert_map_free(UvVertMap *vmap)
|
||||
/* Generates a map where the key is the vertex and the value is a list
|
||||
* of polys that use that vertex as a corner. The lists are allocated
|
||||
* from one memory pool. */
|
||||
void create_vert_poly_map(MeshElemMap **map, int **mem,
|
||||
const MPoly *mpoly, const MLoop *mloop,
|
||||
int totvert, int totpoly, int totloop)
|
||||
void BKE_mesh_vert_poly_map_create(MeshElemMap **map, int **mem,
|
||||
const MPoly *mpoly, const MLoop *mloop,
|
||||
int totvert, int totpoly, int totloop)
|
||||
{
|
||||
int i, j;
|
||||
int *indices;
|
||||
@ -2359,8 +2360,8 @@ void create_vert_poly_map(MeshElemMap **map, int **mem,
|
||||
/* Generates a map where the key is the vertex and the value is a list
|
||||
* of edges that use that vertex as an endpoint. The lists are allocated
|
||||
* from one memory pool. */
|
||||
void create_vert_edge_map(MeshElemMap **map, int **mem,
|
||||
const MEdge *medge, int totvert, int totedge)
|
||||
void BKE_mesh_vert_edge_map_create(MeshElemMap **map, int **mem,
|
||||
const MEdge *medge, int totvert, int totedge)
|
||||
{
|
||||
int i, *indices;
|
||||
|
||||
@ -2465,7 +2466,7 @@ int BKE_mesh_recalc_tessellation(CustomData *fdata,
|
||||
int totpoly,
|
||||
/* when tessellating to recalculate normals after
|
||||
* we can skip copying here */
|
||||
const int do_face_nor_cpy)
|
||||
const bool do_face_nor_cpy)
|
||||
{
|
||||
/* use this to avoid locking pthread for _every_ polygon
|
||||
* and calling the fill function */
|
||||
@ -3335,7 +3336,7 @@ int BKE_mesh_center_centroid(Mesh *me, float cent[3])
|
||||
return (me->totpoly != 0);
|
||||
}
|
||||
|
||||
void BKE_mesh_translate(Mesh *me, float offset[3], int do_keys)
|
||||
void BKE_mesh_translate(Mesh *me, const float offset[3], const bool do_keys)
|
||||
{
|
||||
int i = me->totvert;
|
||||
MVert *mvert;
|
||||
@ -3374,9 +3375,9 @@ void BKE_mesh_tessface_calc(Mesh *mesh)
|
||||
mesh->mvert,
|
||||
mesh->totface, mesh->totloop, mesh->totpoly,
|
||||
/* calc normals right after, don't copy from polys here */
|
||||
FALSE);
|
||||
false);
|
||||
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
}
|
||||
|
||||
void BKE_mesh_tessface_ensure(Mesh *mesh)
|
||||
|
@ -190,13 +190,13 @@ int BKE_mesh_validate_arrays(Mesh *mesh,
|
||||
MLoop *mloops, unsigned int totloop,
|
||||
MPoly *mpolys, unsigned int totpoly,
|
||||
MDeformVert *dverts, /* assume totvert length */
|
||||
const short do_verbose, const short do_fixes)
|
||||
const bool do_verbose, const bool do_fixes)
|
||||
{
|
||||
# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; } (void)0
|
||||
# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = true; } (void)0
|
||||
# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
|
||||
|
||||
# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; } (void)0
|
||||
# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; } (void)0
|
||||
# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = true; } (void)0
|
||||
# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = true; } (void)0
|
||||
|
||||
MVert *mv = mverts;
|
||||
MEdge *me;
|
||||
@ -205,15 +205,15 @@ int BKE_mesh_validate_arrays(Mesh *mesh,
|
||||
unsigned int i, j;
|
||||
int *v;
|
||||
|
||||
short do_edge_free = FALSE;
|
||||
short do_face_free = FALSE;
|
||||
short do_polyloop_free = FALSE; /* This regroups loops and polys! */
|
||||
bool do_edge_free = false;
|
||||
bool do_face_free = false;
|
||||
bool do_polyloop_free = false; /* This regroups loops and polys! */
|
||||
|
||||
short verts_fixed = FALSE;
|
||||
short vert_weights_fixed = FALSE;
|
||||
int msel_fixed = FALSE;
|
||||
bool verts_fixed = false;
|
||||
bool vert_weights_fixed = false;
|
||||
bool msel_fixed = false;
|
||||
|
||||
int do_edge_recalc = FALSE;
|
||||
bool do_edge_recalc = false;
|
||||
|
||||
EdgeHash *edge_hash = BLI_edgehash_new();
|
||||
|
||||
@ -825,7 +825,7 @@ int BKE_mesh_validate_arrays(Mesh *mesh,
|
||||
return (verts_fixed || vert_weights_fixed || do_polyloop_free || do_edge_free || do_edge_recalc || msel_fixed);
|
||||
}
|
||||
|
||||
static int mesh_validate_customdata(CustomData *data, short do_verbose, const short do_fixes)
|
||||
static int mesh_validate_customdata(CustomData *data, const bool do_verbose, const bool do_fixes)
|
||||
{
|
||||
int i = 0, has_fixes = 0;
|
||||
|
||||
@ -859,7 +859,7 @@ static int mesh_validate_customdata(CustomData *data, short do_verbose, const sh
|
||||
|
||||
static int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata,
|
||||
CustomData *ldata, CustomData *pdata,
|
||||
short do_verbose, const short do_fixes)
|
||||
const bool do_verbose, const short do_fixes)
|
||||
{
|
||||
int vfixed = 0, efixed = 0, lfixed = 0, pfixed = 0;
|
||||
|
||||
@ -871,7 +871,7 @@ static int BKE_mesh_validate_all_customdata(CustomData *vdata, CustomData *edata
|
||||
return vfixed || efixed || lfixed || pfixed;
|
||||
}
|
||||
|
||||
int BKE_mesh_validate(Mesh *me, int do_verbose)
|
||||
int BKE_mesh_validate(Mesh *me, const int do_verbose)
|
||||
{
|
||||
int layers_fixed = 0, arrays_fixed = 0;
|
||||
|
||||
@ -887,13 +887,13 @@ int BKE_mesh_validate(Mesh *me, int do_verbose)
|
||||
me->mloop, me->totloop,
|
||||
me->mpoly, me->totpoly,
|
||||
me->dvert,
|
||||
do_verbose, TRUE);
|
||||
do_verbose, true);
|
||||
|
||||
if (layers_fixed || arrays_fixed) {
|
||||
DAG_id_tag_update(&me->id, OB_RECALC_DATA);
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
return FALSE;
|
||||
return false;
|
||||
}
|
||||
|
||||
int BKE_mesh_validate_dm(DerivedMesh *dm)
|
||||
|
@ -295,7 +295,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm,
|
||||
float uv[3] = {0.0f, 0.0f, 0.0f}; /* only first 2 values are written into */
|
||||
|
||||
limit[0] = limit[1] = STD_UV_CONNECT_LIMIT;
|
||||
vmap = BKE_mesh_uv_vert_map_make(mpoly, mloop, mloopuv, totface, totvert, 0, limit);
|
||||
vmap = BKE_mesh_uv_vert_map_create(mpoly, mloop, mloopuv, totface, totvert, 0, limit);
|
||||
if (!vmap)
|
||||
return 0;
|
||||
|
||||
@ -2985,7 +2985,7 @@ static const MeshElemMap *ccgDM_getPolyMap(Object *ob, DerivedMesh *dm)
|
||||
if (!ccgdm->multires.mmd && !ccgdm->pmap && ob->type == OB_MESH) {
|
||||
Mesh *me = ob->data;
|
||||
|
||||
create_vert_poly_map(&ccgdm->pmap, &ccgdm->pmap_mem,
|
||||
BKE_mesh_vert_poly_map_create(&ccgdm->pmap, &ccgdm->pmap_mem,
|
||||
me->mpoly, me->mloop,
|
||||
me->totvert, me->totpoly, me->totloop);
|
||||
}
|
||||
|
@ -453,7 +453,7 @@ static void customdata_version_242(Mesh *me)
|
||||
}
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
/*only copy render texface layer from active*/
|
||||
|
@ -1869,7 +1869,7 @@ static void write_meshs(WriteData *wd, ListBase *idbase)
|
||||
mesh->totface = BKE_mesh_mpoly_to_mface(&mesh->fdata, &backup_mesh.ldata, &backup_mesh.pdata,
|
||||
mesh->totface, backup_mesh.totloop, backup_mesh.totpoly);
|
||||
|
||||
mesh_update_customdata_pointers(mesh, FALSE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, false);
|
||||
|
||||
writestruct(wd, ID_ME, "Mesh", 1, mesh);
|
||||
|
||||
@ -1906,7 +1906,7 @@ static void write_meshs(WriteData *wd, ListBase *idbase)
|
||||
mesh->totpoly = backup_mesh.totpoly;
|
||||
mesh->totloop = backup_mesh.totloop;
|
||||
/* -- */
|
||||
mesh_update_customdata_pointers(mesh, FALSE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, false);
|
||||
/* --*/
|
||||
mesh->edit_btmesh = backup_mesh.edit_btmesh; /* keep this after updating custom pointers */
|
||||
/* restore */
|
||||
|
@ -628,7 +628,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface)
|
||||
me->cd_flag = BM_mesh_cd_flag_from_bmesh(bm);
|
||||
|
||||
/* this is called again, 'dotess' arg is used there */
|
||||
mesh_update_customdata_pointers(me, 0);
|
||||
BKE_mesh_update_customdata_pointers(me, 0);
|
||||
|
||||
i = 0;
|
||||
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
|
||||
@ -768,7 +768,7 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, bool do_tessface)
|
||||
BKE_mesh_tessface_calc(me);
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, do_tessface);
|
||||
BKE_mesh_update_customdata_pointers(me, do_tessface);
|
||||
|
||||
{
|
||||
BMEditSelection *selected;
|
||||
|
@ -465,7 +465,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->edata, mesh->totedge);
|
||||
mesh->edata = edata;
|
||||
mesh_update_customdata_pointers(mesh, FALSE); /* new edges don't change tessellation */
|
||||
BKE_mesh_update_customdata_pointers(mesh, false); /* new edges don't change tessellation */
|
||||
|
||||
/* set default flags */
|
||||
medge = &mesh->medge[mesh->totedge];
|
||||
@ -1029,7 +1029,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta
|
||||
Mesh *old_mesh = (Mesh *)ob->data;
|
||||
Mesh *new_mesh = uid_mesh_map[*geom_uid];
|
||||
|
||||
set_mesh(ob, new_mesh);
|
||||
BKE_mesh_assign_object(ob, new_mesh);
|
||||
|
||||
if (old_mesh->id.us == 0) BKE_libblock_free(&G.main->mesh, old_mesh);
|
||||
|
||||
@ -1075,7 +1075,7 @@ bool MeshImporter::write_geometry(const COLLADAFW::Geometry *geom)
|
||||
|
||||
const std::string& str_geom_id = mesh->getName().size() ? mesh->getName() : mesh->getOriginalId();
|
||||
Mesh *me = BKE_mesh_add(G.main, (char *)str_geom_id.c_str());
|
||||
me->id.us--; // is already 1 here, but will be set later in set_mesh
|
||||
me->id.us--; // is already 1 here, but will be set later in BKE_mesh_assign_object
|
||||
|
||||
// store the Mesh pointer to link it later with an Object
|
||||
// mesh_geom_map needed to map mesh to its geometry name (for shape key naming)
|
||||
|
@ -216,7 +216,7 @@ bool ED_view3d_viewplane_get(struct View3D *v3d, struct RegionView3D *rv3d, int
|
||||
struct rctf *r_viewplane, float *r_clipsta, float *r_clipend);
|
||||
void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar,
|
||||
struct View3D *v3d, struct RegionView3D *rv3d,
|
||||
struct rctf *viewborder_r, const bool no_shift);
|
||||
struct rctf *r_viewborder, const bool no_shift);
|
||||
void ED_view3d_calc_camera_border_size(struct Scene *scene, struct ARegion *ar,
|
||||
struct View3D *v3d, struct RegionView3D *rv3d,
|
||||
float r_size[2]);
|
||||
@ -268,7 +268,7 @@ int edge_inside_circle(const float cent[2], float radius, const float screen_co_
|
||||
|
||||
/* get 3d region from context, also if mouse is in header or toolbar */
|
||||
struct RegionView3D *ED_view3d_context_rv3d(struct bContext *C);
|
||||
int ED_view3d_context_user_region(struct bContext *C, struct View3D **v3d_r, struct ARegion **ar_r);
|
||||
int ED_view3d_context_user_region(struct bContext *C, struct View3D **r_v3d, struct ARegion **r_ar);
|
||||
int ED_operator_rv3d_user_region_poll(struct bContext *C);
|
||||
|
||||
void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d);
|
||||
|
@ -159,7 +159,7 @@ static void delete_customdata_layer(bContext *C, Object *ob, CustomDataLayer *la
|
||||
}
|
||||
else {
|
||||
CustomData_free_layer_active(data, type, tot);
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
if (!CustomData_has_layer(data, type) && (type == CD_MLOOPCOL && (ob->mode & OB_MODE_VERTEX_PAINT)))
|
||||
@ -406,7 +406,7 @@ int ED_mesh_uv_texture_add(bContext *C, Mesh *me, const char *name, int active_s
|
||||
CustomData_set_layer_active(&me->fdata, CD_MTFACE, layernum_dst);
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
/* don't overwrite our copied coords */
|
||||
@ -489,7 +489,7 @@ int ED_mesh_color_add(bContext *C, Scene *UNUSED(scene), Object *UNUSED(ob), Mes
|
||||
CustomData_set_layer_active(&me->fdata, CD_MCOL, layernum);
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
DAG_id_tag_update(&me->id, 0);
|
||||
@ -942,7 +942,7 @@ static void mesh_add_verts(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->vdata, mesh->totvert);
|
||||
mesh->vdata = vdata;
|
||||
mesh_update_customdata_pointers(mesh, FALSE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, false);
|
||||
|
||||
/* scan the input list and insert the new vertices */
|
||||
|
||||
@ -986,7 +986,7 @@ static void mesh_add_edges(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->edata, mesh->totedge);
|
||||
mesh->edata = edata;
|
||||
mesh_update_customdata_pointers(mesh, FALSE); /* new edges don't change tessellation */
|
||||
BKE_mesh_update_customdata_pointers(mesh, false); /* new edges don't change tessellation */
|
||||
|
||||
/* set default flags */
|
||||
medge = &mesh->medge[mesh->totedge];
|
||||
@ -1016,7 +1016,7 @@ static void mesh_add_tessfaces(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->fdata, mesh->totface);
|
||||
mesh->fdata = fdata;
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
|
||||
/* set default flags */
|
||||
mface = &mesh->mface[mesh->totface];
|
||||
@ -1045,7 +1045,7 @@ static void mesh_add_loops(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->ldata, mesh->totloop);
|
||||
mesh->ldata = ldata;
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
|
||||
mesh->totloop = totloop;
|
||||
}
|
||||
@ -1070,7 +1070,7 @@ static void mesh_add_polys(Mesh *mesh, int len)
|
||||
|
||||
CustomData_free(&mesh->pdata, mesh->totpoly);
|
||||
mesh->pdata = pdata;
|
||||
mesh_update_customdata_pointers(mesh, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(mesh, true);
|
||||
|
||||
/* set default flags */
|
||||
mpoly = &mesh->mpoly[mesh->totpoly];
|
||||
|
@ -505,7 +505,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
|
||||
me->pdata = pdata;
|
||||
|
||||
/* tessface data removed above, no need to update */
|
||||
mesh_update_customdata_pointers(me, FALSE);
|
||||
BKE_mesh_update_customdata_pointers(me, false);
|
||||
|
||||
/* update normals in case objects with non-uniform scale are joined */
|
||||
ED_mesh_calc_normals(me);
|
||||
|
@ -1754,7 +1754,7 @@ static Object *modifier_skin_armature_create(struct Scene *scene,
|
||||
arm->edbo = MEM_callocN(sizeof(ListBase), "edbo armature");
|
||||
|
||||
mvert_skin = CustomData_get_layer(&me->vdata, CD_MVERT_SKIN);
|
||||
create_vert_edge_map(&emap, &emap_mem,
|
||||
BKE_mesh_vert_edge_map_create(&emap, &emap_mem,
|
||||
me->medge, me->totvert, me->totedge);
|
||||
|
||||
edges_visited = BLI_BITMAP_NEW(me->totedge, "edge_visited");
|
||||
|
@ -354,7 +354,7 @@ static void make_vertexcol(Object *ob) /* single ob */
|
||||
if (!me->mloopcol) {
|
||||
CustomData_add_layer(&me->ldata, CD_MLOOPCOL, CD_DEFAULT, NULL, me->totloop);
|
||||
}
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
update_tessface_data(ob, me);
|
||||
|
@ -4553,7 +4553,7 @@ void sculpt_dynamic_topology_disable(bContext *C,
|
||||
CustomData_copy(&unode->bm_enter_pdata, &me->pdata, CD_MASK_MESH,
|
||||
CD_DUPLICATE, unode->bm_enter_totpoly);
|
||||
|
||||
mesh_update_customdata_pointers(me, FALSE);
|
||||
BKE_mesh_update_customdata_pointers(me, false);
|
||||
}
|
||||
else {
|
||||
sculptsession_bm_to_me(ob, TRUE);
|
||||
|
@ -159,12 +159,12 @@ RegionView3D *ED_view3d_context_rv3d(bContext *C)
|
||||
|
||||
/* ideally would return an rv3d but in some cases the region is needed too
|
||||
* so return that, the caller can then access the ar->regiondata */
|
||||
int ED_view3d_context_user_region(bContext *C, View3D **v3d_r, ARegion **ar_r)
|
||||
int ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_ar)
|
||||
{
|
||||
ScrArea *sa = CTX_wm_area(C);
|
||||
|
||||
*v3d_r = NULL;
|
||||
*ar_r = NULL;
|
||||
*r_v3d = NULL;
|
||||
*r_ar = NULL;
|
||||
|
||||
if (sa && sa->spacetype == SPACE_VIEW3D) {
|
||||
ARegion *ar = CTX_wm_region(C);
|
||||
@ -173,8 +173,8 @@ int ED_view3d_context_user_region(bContext *C, View3D **v3d_r, ARegion **ar_r)
|
||||
if (ar) {
|
||||
RegionView3D *rv3d = ar->regiondata;
|
||||
if (rv3d && rv3d->viewlock == 0) {
|
||||
*v3d_r = v3d;
|
||||
*ar_r = ar;
|
||||
*r_v3d = v3d;
|
||||
*r_ar = ar;
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
@ -196,14 +196,14 @@ int ED_view3d_context_user_region(bContext *C, View3D **v3d_r, ARegion **ar_r)
|
||||
|
||||
/* camera/perspective view get priority when the active region is locked */
|
||||
if (ar_unlock_user) {
|
||||
*v3d_r = v3d;
|
||||
*ar_r = ar_unlock_user;
|
||||
*r_v3d = v3d;
|
||||
*r_ar = ar_unlock_user;
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (ar_unlock) {
|
||||
*v3d_r = v3d;
|
||||
*ar_r = ar_unlock;
|
||||
*r_v3d = v3d;
|
||||
*r_ar = ar_unlock;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
@ -1008,9 +1008,9 @@ void ED_view3d_calc_camera_border_size(Scene *scene, ARegion *ar, View3D *v3d, R
|
||||
}
|
||||
|
||||
void ED_view3d_calc_camera_border(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D *rv3d,
|
||||
rctf *viewborder_r, const bool no_shift)
|
||||
rctf *r_viewborder, const bool no_shift)
|
||||
{
|
||||
view3d_camera_border(scene, ar, v3d, rv3d, viewborder_r, no_shift, false);
|
||||
view3d_camera_border(scene, ar, v3d, rv3d, r_viewborder, no_shift, false);
|
||||
}
|
||||
|
||||
static void drawviewborder_grid3(float x1, float x2, float y1, float y2, float fac)
|
||||
|
@ -1859,7 +1859,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[3][3],
|
||||
}
|
||||
|
||||
/* loop-in-a-loop I know, but we need it! (ton) */
|
||||
static void get_face_center(float cent_r[3], BMVert *eve)
|
||||
static void get_face_center(float r_cent[3], BMVert *eve)
|
||||
|
||||
{
|
||||
BMFace *efa;
|
||||
@ -1867,20 +1867,20 @@ static void get_face_center(float cent_r[3], BMVert *eve)
|
||||
|
||||
BM_ITER_ELEM (efa, &iter, eve, BM_FACES_OF_VERT) {
|
||||
if (BM_elem_flag_test(efa, BM_ELEM_SELECT)) {
|
||||
BM_face_calc_center_mean(efa, cent_r);
|
||||
BM_face_calc_center_mean(efa, r_cent);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void get_edge_center(float cent_r[3], BMVert *eve)
|
||||
static void get_edge_center(float r_cent[3], BMVert *eve)
|
||||
{
|
||||
BMEdge *eed;
|
||||
BMIter iter;
|
||||
|
||||
BM_ITER_ELEM (eed, &iter, eve, BM_EDGES_OF_VERT) {
|
||||
if (BM_elem_flag_test(eed, BM_ELEM_SELECT)) {
|
||||
mid_v3_v3v3(cent_r, eed->v1->co, eed->v2->co);
|
||||
mid_v3_v3v3(r_cent, eed->v1->co, eed->v2->co);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -528,7 +528,7 @@ static void rna_CustomDataLayer_active_set(PointerRNA *ptr, CustomData *data, in
|
||||
else CustomData_set_layer_active(ldata, CD_MLOOPUV, n);
|
||||
}
|
||||
|
||||
mesh_update_customdata_pointers(me, TRUE);
|
||||
BKE_mesh_update_customdata_pointers(me, true);
|
||||
}
|
||||
|
||||
static void rna_CustomDataLayer_clone_set(PointerRNA *ptr, CustomData *data, int value, int type, int render)
|
||||
|
@ -110,7 +110,7 @@
|
||||
CustomData *ldata = rna_mesh_ldata_helper(me); \
|
||||
CustomData_set_layer_##active_type(ldata, CD_MLOOPUV, a); \
|
||||
} \
|
||||
mesh_update_customdata_pointers(me, TRUE); \
|
||||
BKE_mesh_update_customdata_pointers(me, true); \
|
||||
return; \
|
||||
} \
|
||||
} \
|
||||
@ -139,7 +139,7 @@
|
||||
CustomData *ldata = rna_mesh_ldata_helper(me); \
|
||||
CustomData_set_layer_##active_type(ldata, CD_MLOOPUV, value); \
|
||||
} \
|
||||
mesh_update_customdata_pointers(me, TRUE); \
|
||||
BKE_mesh_update_customdata_pointers(me, true); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
@ -383,7 +383,7 @@ static void rna_Object_data_set(PointerRNA *ptr, PointerRNA value)
|
||||
}
|
||||
}
|
||||
else if (ob->type == OB_MESH) {
|
||||
set_mesh(ob, (Mesh *)id);
|
||||
BKE_mesh_assign_object(ob, (Mesh *)id);
|
||||
}
|
||||
else {
|
||||
if (ob->data) {
|
||||
|
@ -1785,7 +1785,7 @@ static DerivedMesh *base_skin(DerivedMesh *origdm,
|
||||
totvert = origdm->getNumVerts(origdm);
|
||||
totedge = origdm->getNumEdges(origdm);
|
||||
|
||||
create_vert_edge_map(&emap, &emapmem, medge, totvert, totedge);
|
||||
BKE_mesh_vert_edge_map_create(&emap, &emapmem, medge, totvert, totedge);
|
||||
|
||||
emat = build_edge_mats(nodes, mvert, totvert, medge, emap, totedge);
|
||||
skin_nodes = build_frames(mvert, totvert, nodes, emap, emat);
|
||||
|
Loading…
Reference in New Issue
Block a user