From ab0bc65c24bdf68c356adb2566f3669153c931ea Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 7 Mar 2019 11:13:40 +0100 Subject: Refactor CDData masks, to have one mask per mesh elem type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already have different storages for cddata of verts, edges etc., 'simply' do the same for the mask flags we use all around Blender code to request some data, or limit some operation to some layers, etc. Reason we need this is that some cddata types (like Normals) are actually shared between verts/polys/loops, and we don’t want to generate clnors everytime we request vnors! As a side note, this also does final fix to T59338, which was the trigger for this patch (need to request computed loop normals for another mesh than evaluated one). Reviewers: brecht, campbellbarton, sergey Differential Revision: https://developer.blender.org/D4407 --- source/blender/editors/object/object_bake.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/object/object_bake.c') diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 9835d09ec3a..ac1f31d0b48 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -226,7 +226,7 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l MultiresModifierData tmp_mmd = *mmd; DerivedMesh *cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); if (mmd->lvl == 0) { dm = CDDM_copy(cddm); @@ -252,13 +252,13 @@ static DerivedMesh *multiresbake_create_hiresdm(Scene *scene, Object *ob, int *l DerivedMesh *cddm = CDDM_from_mesh(me); DerivedMesh *dm; - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); /* TODO: DM_set_only_copy wouldn't set mask for loop and poly data, * but we really need BAREMESH only to save lots of memory */ - CustomData_set_only_copy(&cddm->loopData, CD_MASK_BAREMESH); - CustomData_set_only_copy(&cddm->polyData, CD_MASK_BAREMESH); + CustomData_set_only_copy(&cddm->loopData, CD_MASK_BAREMESH.lmask); + CustomData_set_only_copy(&cddm->polyData, CD_MASK_BAREMESH.pmask); *lvl = mmd->totlvl; *simple = mmd->simple != 0; -- cgit v1.2.3