Mesh: remove derivedFinal from various places
This commit is contained in:
parent
cd3b313d5f
commit
86635402d5
@ -3753,12 +3753,12 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
|
||||
Mesh *me = ob->data;
|
||||
unsigned int i;
|
||||
|
||||
DerivedMesh *dm = ob->derivedDeform ? ob->derivedDeform : ob->derivedFinal;
|
||||
Mesh *me_eval = ob->runtime.mesh_deform_eval ? ob->runtime.mesh_deform_eval : ob->runtime.mesh_deform_eval;
|
||||
const int *index;
|
||||
|
||||
if (dm && (index = CustomData_get_layer(&dm->vertData, CD_ORIGINDEX))) {
|
||||
MVert *mvert = dm->getVertArray(dm);
|
||||
unsigned int totvert = dm->getNumVerts(dm);
|
||||
if (me_eval && (index = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX))) {
|
||||
MVert *mvert = me_eval->mvert;
|
||||
uint totvert = me_eval->totvert;
|
||||
|
||||
/* tree over-allocs in case where some verts have ORIGINDEX_NONE */
|
||||
tot = 0;
|
||||
|
@ -66,7 +66,7 @@ static LinkNode *knifeproject_poly_from_object(const bContext *C, Scene *scene,
|
||||
struct Mesh *me_eval;
|
||||
bool me_eval_needs_free;
|
||||
|
||||
if (ob->type == OB_MESH || ob->derivedFinal) {
|
||||
if (ob->type == OB_MESH || ob->runtime.mesh_eval) {
|
||||
me_eval = (ob->runtime.mesh_eval ?
|
||||
ob->runtime.mesh_eval : mesh_get_eval_final(depsgraph, scene, ob, CD_MASK_BAREMESH));
|
||||
me_eval_needs_free = false;
|
||||
|
@ -173,12 +173,12 @@ static MDeformVert *defweight_prev_init(MDeformVert *dvert_prev, MDeformVert *dv
|
||||
* (without rebuilding the 'derivedFinal') */
|
||||
static bool vertex_paint_use_fast_update_check(Object *ob)
|
||||
{
|
||||
DerivedMesh *dm = ob->derivedFinal;
|
||||
Mesh *me_eval = ob->runtime.mesh_eval;
|
||||
|
||||
if (dm) {
|
||||
if (me_eval != NULL) {
|
||||
Mesh *me = BKE_mesh_from_object(ob);
|
||||
if (me && me->mloopcol) {
|
||||
return (me->mloopcol == CustomData_get_layer(&dm->loopData, CD_MLOOPCOL));
|
||||
return (me->mloopcol == CustomData_get_layer(&me_eval->ldata, CD_MLOOPCOL));
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user