Cleanup: use 'nomain' when not in library data
Rename only.
This commit is contained in:
@@ -102,7 +102,7 @@ void BKE_mesh_update_customdata_pointers(struct Mesh *me, const bool do_ensure_t
|
|||||||
void BKE_mesh_ensure_skin_customdata(struct Mesh *me);
|
void BKE_mesh_ensure_skin_customdata(struct Mesh *me);
|
||||||
|
|
||||||
struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys);
|
struct Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys);
|
||||||
struct Mesh *BKE_mesh_from_template(
|
struct Mesh *BKE_mesh_new_nomain_from_template(
|
||||||
const struct Mesh *me_src,
|
const struct Mesh *me_src,
|
||||||
int numVerts, int numEdges, int numTessFaces,
|
int numVerts, int numEdges, int numTessFaces,
|
||||||
int numLoops, int numPolys);
|
int numLoops, int numPolys);
|
||||||
|
@@ -651,7 +651,7 @@ Mesh *BKE_mesh_new_nomain(int numVerts, int numEdges, int numTessFaces, int numL
|
|||||||
return mesh;
|
return mesh;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Mesh *mesh_from_template_ex(
|
static Mesh *mesh_new_nomain_from_template_ex(
|
||||||
const Mesh *me_src,
|
const Mesh *me_src,
|
||||||
int numVerts, int numEdges, int numTessFaces,
|
int numVerts, int numEdges, int numTessFaces,
|
||||||
int numLoops, int numPolys,
|
int numLoops, int numPolys,
|
||||||
@@ -692,11 +692,12 @@ static Mesh *mesh_from_template_ex(
|
|||||||
return me_dst;
|
return me_dst;
|
||||||
}
|
}
|
||||||
|
|
||||||
Mesh * BKE_mesh_from_template(const Mesh *me_src,
|
Mesh * BKE_mesh_new_nomain_from_template(
|
||||||
|
const Mesh *me_src,
|
||||||
int numVerts, int numEdges, int numTessFaces,
|
int numVerts, int numEdges, int numTessFaces,
|
||||||
int numLoops, int numPolys)
|
int numLoops, int numPolys)
|
||||||
{
|
{
|
||||||
return mesh_from_template_ex(
|
return mesh_new_nomain_from_template_ex(
|
||||||
me_src,
|
me_src,
|
||||||
numVerts, numEdges, numTessFaces,
|
numVerts, numEdges, numTessFaces,
|
||||||
numLoops, numPolys,
|
numLoops, numPolys,
|
||||||
|
@@ -610,7 +610,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*create new cddm*/
|
/*create new cddm*/
|
||||||
result = BKE_mesh_from_template(
|
result = BKE_mesh_new_nomain_from_template(
|
||||||
mesh, STACK_SIZE(mvert), STACK_SIZE(medge), 0, STACK_SIZE(mloop), STACK_SIZE(mpoly));
|
mesh, STACK_SIZE(mvert), STACK_SIZE(medge), 0, STACK_SIZE(mloop), STACK_SIZE(mpoly));
|
||||||
|
|
||||||
/*update edge indices and copy customdata*/
|
/*update edge indices and copy customdata*/
|
||||||
|
@@ -488,7 +488,7 @@ static Mesh *arrayModifier_doArray(
|
|||||||
result_npolys = chunk_npolys * count + start_cap_npolys + end_cap_npolys;
|
result_npolys = chunk_npolys * count + start_cap_npolys + end_cap_npolys;
|
||||||
|
|
||||||
/* Initialize a result dm */
|
/* Initialize a result dm */
|
||||||
result = BKE_mesh_from_template(mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys);
|
result = BKE_mesh_new_nomain_from_template(mesh, result_nverts, result_nedges, 0, result_nloops, result_npolys);
|
||||||
result_dm_verts = result->mvert;
|
result_dm_verts = result->mvert;
|
||||||
|
|
||||||
if (use_merge) {
|
if (use_merge) {
|
||||||
|
@@ -217,7 +217,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* now we know the number of verts, edges and faces, we can create the mesh. */
|
/* now we know the number of verts, edges and faces, we can create the mesh. */
|
||||||
result = BKE_mesh_from_template(mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash),
|
result = BKE_mesh_new_nomain_from_template(
|
||||||
|
mesh, BLI_ghash_len(vertHash), BLI_ghash_len(edgeHash),
|
||||||
0, numLoops_dst, numFaces_dst);
|
0, numLoops_dst, numFaces_dst);
|
||||||
|
|
||||||
/* copy the vertices across */
|
/* copy the vertices across */
|
||||||
|
@@ -124,7 +124,8 @@ static Mesh *doMirrorOnAxis(MirrorModifierData *mmd,
|
|||||||
mul_m4_m4m4(mtx, itmp, mtx);
|
mul_m4_m4m4(mtx, itmp, mtx);
|
||||||
}
|
}
|
||||||
|
|
||||||
result = BKE_mesh_from_template(mesh, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2);
|
result = BKE_mesh_new_nomain_from_template(
|
||||||
|
mesh, maxVerts * 2, maxEdges * 2, 0, maxLoops * 2, maxPolys * 2);
|
||||||
|
|
||||||
/*copy customdata to original geometry*/
|
/*copy customdata to original geometry*/
|
||||||
CustomData_copy_data(&mesh->vdata, &result->vdata, 0, 0, maxVerts);
|
CustomData_copy_data(&mesh->vdata, &result->vdata, 0, 0, maxVerts);
|
||||||
|
@@ -853,7 +853,8 @@ static Mesh *subdivide_base(Mesh *orig)
|
|||||||
MEM_freeN(degree);
|
MEM_freeN(degree);
|
||||||
|
|
||||||
/* Allocate output derivedmesh */
|
/* Allocate output derivedmesh */
|
||||||
result = BKE_mesh_from_template(orig,
|
result = BKE_mesh_new_nomain_from_template(
|
||||||
|
orig,
|
||||||
totorigvert + totsubd,
|
totorigvert + totsubd,
|
||||||
totorigedge + totsubd,
|
totorigedge + totsubd,
|
||||||
0, 0, 0);
|
0, 0, 0);
|
||||||
|
@@ -360,7 +360,8 @@ static Mesh *applyModifier(
|
|||||||
mesh_calc_hq_normal(mesh, face_nors, vert_nors);
|
mesh_calc_hq_normal(mesh, face_nors, vert_nors);
|
||||||
}
|
}
|
||||||
|
|
||||||
result = BKE_mesh_from_template(mesh,
|
result = BKE_mesh_new_nomain_from_template(
|
||||||
|
mesh,
|
||||||
(int)((numVerts * stride) + newVerts),
|
(int)((numVerts * stride) + newVerts),
|
||||||
(int)((numEdges * stride) + newEdges + rimVerts), 0,
|
(int)((numEdges * stride) + newEdges + rimVerts), 0,
|
||||||
(int)((numLoops * stride) + newLoops),
|
(int)((numLoops * stride) + newLoops),
|
||||||
|
Reference in New Issue
Block a user