diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-07 13:13:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-07 13:29:50 +0300 |
| commit | ab0bc65c24bdf68c356adb2566f3669153c931ea (patch) | |
| tree | 23909478874a13d84e504a905809eb211e62a9e2 /source/blender/blenkernel | |
| parent | cee53160d2bd9067a3d43cc862ce61e36ff70454 (diff) | |
Refactor CDData masks, to have one mask per mesh elem type.
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
Diffstat (limited to 'source/blender/blenkernel')
28 files changed, 501 insertions, 364 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index fb78e03639b..cd7422415dc 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -75,6 +75,7 @@ struct BMEditMesh; struct CCGElem; struct CCGKey; +struct CustomData_MeshMasks; struct Depsgraph; struct MEdge; struct MFace; @@ -348,7 +349,7 @@ void DM_from_template_ex( DerivedMesh *dm, DerivedMesh *source, DerivedMeshType type, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys, - CustomDataMask mask); + const struct CustomData_MeshMasks *mask); void DM_from_template( DerivedMesh *dm, DerivedMesh *source, DerivedMeshType type, @@ -362,10 +363,11 @@ int DM_release(DerivedMesh *dm); /** utility function to convert a DerivedMesh to a Mesh */ -void DM_to_mesh(DerivedMesh *dm, struct Mesh *me, struct Object *ob, CustomDataMask mask, bool take_ownership); +void DM_to_mesh(DerivedMesh *dm, struct Mesh *me, struct Object *ob, + const struct CustomData_MeshMasks *mask, bool take_ownership); -void DM_set_only_copy(DerivedMesh *dm, CustomDataMask mask); +void DM_set_only_copy(DerivedMesh *dm, const struct CustomData_MeshMasks *mask); /* adds a vertex/edge/face custom data layer to a DerivedMesh, optionally * backed by an external data array @@ -488,27 +490,27 @@ void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const DerivedMesh *mesh_create_derived_render( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); /* same as above but wont use render settings */ DerivedMesh *mesh_create_derived(struct Mesh *me, float (*vertCos)[3]); struct Mesh *editbmesh_get_eval_cage( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, - struct BMEditMesh *em, CustomDataMask dataMask); + struct BMEditMesh *em, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_from_orig( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, - struct BMEditMesh *em, CustomDataMask dataMask); + struct BMEditMesh *em, const struct CustomData_MeshMasks *dataMask); struct Mesh *editbmesh_get_eval_cage_and_final( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, - struct BMEditMesh *em, CustomDataMask dataMask, + struct BMEditMesh *em, const struct CustomData_MeshMasks *dataMask, struct Mesh **r_final); float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *r_numVerts))[3]; bool editbmesh_modifier_is_enabled(struct Scene *scene, struct ModifierData *md, bool has_prev_mesh); void makeDerivedMesh( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, struct BMEditMesh *em, - CustomDataMask dataMask, const bool build_shapekey_layers); + const struct CustomData_MeshMasks *dataMask, const bool build_shapekey_layers); void DM_add_named_tangent_layer_for_uv( CustomData *uv_data, CustomData *tan_data, int numLoopData, diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index 1e7bad3cd6c..e218355447d 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -31,6 +31,7 @@ #include "BKE_customdata.h" struct BMEditMesh; +struct CustomData_MeshMasks; struct DerivedMesh; struct MLoopNorSpaceArray; struct Mesh; @@ -47,7 +48,7 @@ struct DerivedMesh *CDDM_new(int numVerts, int numEdges, int numFaces, struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh); /* creates a CDDerivedMesh from the given Mesh with custom allocation type. */ -struct DerivedMesh *CDDM_from_mesh_ex(struct Mesh *mesh, eCDAllocType alloctype, CustomDataMask mask); +struct DerivedMesh *CDDM_from_mesh_ex(struct Mesh *mesh, eCDAllocType alloctype, const struct CustomData_MeshMasks *mask); struct DerivedMesh *CDDM_from_bmesh(struct BMesh *bm, const bool use_mdisps); @@ -71,11 +72,10 @@ struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm); * given DerivedMesh and containing the requested numbers of elements. * elements are initialized to all zeros */ -struct DerivedMesh *CDDM_from_template_ex( - struct DerivedMesh *source, +struct DerivedMesh *CDDM_from_template_ex(struct DerivedMesh *source, int numVerts, int numEdges, int numFaces, int numLoops, int numPolys, - CustomDataMask mask); + const struct CustomData_MeshMasks *mask); struct DerivedMesh *CDDM_from_template( struct DerivedMesh *source, int numVerts, int numEdges, int numFaces, diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index ba3d1dbf187..4a7e6b22b0c 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -36,19 +36,21 @@ extern "C" { struct BMesh; struct CustomData; +struct CustomData_MeshMasks; struct ID; typedef uint64_t CustomDataMask; /*a data type large enough to hold 1 element from any customdata layer type*/ typedef struct {unsigned char data[64]; } CDBlockBytes; -extern const CustomDataMask CD_MASK_BAREMESH; -extern const CustomDataMask CD_MASK_MESH; -extern const CustomDataMask CD_MASK_EDITMESH; -extern const CustomDataMask CD_MASK_DERIVEDMESH; -extern const CustomDataMask CD_MASK_BMESH; -extern const CustomDataMask CD_MASK_FACECORNERS; -extern const CustomDataMask CD_MASK_EVERYTHING; +extern const CustomData_MeshMasks CD_MASK_BAREMESH; +extern const CustomData_MeshMasks CD_MASK_BAREMESH_ORIGINDEX; +extern const CustomData_MeshMasks CD_MASK_MESH; +extern const CustomData_MeshMasks CD_MASK_EDITMESH; +extern const CustomData_MeshMasks CD_MASK_DERIVEDMESH; +extern const CustomData_MeshMasks CD_MASK_BMESH; +extern const CustomData_MeshMasks CD_MASK_FACECORNERS; +extern const CustomData_MeshMasks CD_MASK_EVERYTHING; /* for ORIGINDEX layer type, indicates no original index for this element */ #define ORIGINDEX_NONE -1 @@ -69,12 +71,15 @@ typedef enum eCDAllocType { #define CD_TYPE_AS_MASK(_type) (CustomDataMask)((CustomDataMask)1 << (CustomDataMask)(_type)) -void customData_mask_layers__print(CustomDataMask mask); +void customData_mask_layers__print(const struct CustomData_MeshMasks *mask); typedef void (*cd_interp)(const void **sources, const float *weights, const float *sub_weights, int count, void *dest); typedef void (*cd_copy)(const void *source, void *dest, int count); typedef bool (*cd_validate)(void *item, const uint totitems, const bool do_fixes); +void CustomData_MeshMasks_update(CustomData_MeshMasks *mask_dst, const CustomData_MeshMasks *mask_src); +bool CustomData_MeshMasks_are_matching(const CustomData_MeshMasks *mask_ref, const CustomData_MeshMasks *mask_required); + /** * Checks if the layer at physical offset \a layer_n (in data->layers) support math * the below operations. diff --git a/source/blender/blenkernel/BKE_data_transfer.h b/source/blender/blenkernel/BKE_data_transfer.h index dea36a6fce3..8f949e5d985 100644 --- a/source/blender/blenkernel/BKE_data_transfer.h +++ b/source/blender/blenkernel/BKE_data_transfer.h @@ -66,7 +66,7 @@ enum { }; -CustomDataMask BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types); +void BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types, struct CustomData_MeshMasks *r_data_masks); bool BKE_object_data_transfer_get_dttypes_capacity( const int dtdata_types, bool *r_advanced_mixing, bool *r_threshold); int BKE_object_data_transfer_get_dttypes_item_types(const int dtdata_types); diff --git a/source/blender/blenkernel/BKE_editmesh.h b/source/blender/blenkernel/BKE_editmesh.h index 4850c864d4a..34cd3ddf6f6 100644 --- a/source/blender/blenkernel/BKE_editmesh.h +++ b/source/blender/blenkernel/BKE_editmesh.h @@ -61,7 +61,7 @@ typedef struct BMEditMesh { struct Mesh *mesh_eval_final, *mesh_eval_cage; /*derivedmesh stuff*/ - CustomDataMask lastDataMask; + CustomData_MeshMasks lastDataMask; unsigned char (*derivedVertColor)[4]; int derivedVertColorLen; unsigned char (*derivedFaceColor)[4]; diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 07d04a55496..a2613c2c2e3 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -27,7 +27,7 @@ #include "BLI_compiler_compat.h" /* defines CustomDataMask */ -#include "BKE_customdata.h" +//#include "BKE_customdata.h" struct BLI_Stack; struct BMEditMesh; @@ -37,6 +37,7 @@ struct BMeshFromMeshParams; struct BMeshToMeshParams; struct BoundBox; struct CustomData; +struct CustomData_MeshMasks; struct Depsgraph; struct EdgeHash; struct ID; @@ -83,10 +84,10 @@ struct BMesh *BKE_mesh_to_bmesh( const bool add_key_index, const struct BMeshCreateParams *params); struct Mesh *BKE_mesh_from_bmesh_nomain(struct BMesh *bm, const struct BMeshToMeshParams *params); -struct Mesh *BKE_mesh_from_bmesh_for_eval_nomain(struct BMesh *bm, const int64_t cd_mask_extra); +struct Mesh *BKE_mesh_from_bmesh_for_eval_nomain(struct BMesh *bm, const struct CustomData_MeshMasks *cd_mask_extra); struct Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap( - struct BMEditMesh *em, CustomDataMask data_mask, float (*vertexCos)[3]); + struct BMEditMesh *em, const struct CustomData_MeshMasks *data_mask, float (*vertexCos)[3]); int poly_find_loop_from_vert( const struct MPoly *poly, @@ -179,7 +180,7 @@ struct Mesh *BKE_mesh_create_derived_for_modifier( /* Copies a nomain-Mesh into an existing Mesh. */ void BKE_mesh_nomain_to_mesh(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct Object *ob, - CustomDataMask mask, bool take_ownership); + const struct CustomData_MeshMasks *mask, bool take_ownership); void BKE_mesh_nomain_to_meshkey(struct Mesh *mesh_src, struct Mesh *mesh_dst, struct KeyBlock *kb); diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index 4ee8995dd99..d3eb573bc2d 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -25,10 +25,11 @@ * This file contains access functions for the Mesh.runtime struct. */ -#include "BKE_customdata.h" /* for CustomDataMask */ +//#include "BKE_customdata.h" /* for CustomDataMask */ struct ColorBand; struct CustomData; +struct CustomData_MeshMasks; struct Depsgraph; struct KeyBlock; struct MLoop; @@ -66,50 +67,50 @@ void BKE_mesh_runtime_verttri_from_looptri( #ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_get_derived_final( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); #endif struct Mesh *mesh_get_eval_final( - struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); + struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, const struct CustomData_MeshMasks *dataMask); #ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_get_derived_deform( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); #endif struct Mesh *mesh_get_eval_deform( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_final_render( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); #ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_create_derived_index_render( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask, int index); + struct Object *ob, const struct CustomData_MeshMasks *dataMask, int index); #endif struct Mesh *mesh_create_eval_final_index_render( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask, int index); + struct Object *ob, const struct CustomData_MeshMasks *dataMask, int index); #ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_create_derived_view( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); #endif struct Mesh *mesh_create_eval_final_view( struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask); + struct Object *ob, const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_no_deform( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, float (*vertCos)[3], - CustomDataMask dataMask); + const struct CustomData_MeshMasks *dataMask); struct Mesh *mesh_create_eval_no_deform_render( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, float (*vertCos)[3], - CustomDataMask dataMask); + const struct CustomData_MeshMasks *dataMask); void BKE_mesh_runtime_eval_to_meshkey(struct Mesh *me_deformed, struct Mesh *me, struct KeyBlock *kb); diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 51fb6d8a591..1a1e510b9e1 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -25,6 +25,7 @@ #include "BKE_customdata.h" struct BMEditMesh; +struct CustomData_MeshMasks; struct DepsNodeHandle; struct Depsgraph; struct DerivedMesh; @@ -214,23 +215,20 @@ typedef struct ModifierTypeInfo { */ void (*initData)(struct ModifierData *md); - /* Should return a CustomDataMask indicating what data this + /* Should add to passed \a r_cddata_masks the data types that this * modifier needs. If (mask & (1 << (layer type))) != 0, this modifier - * needs that custom data layer. This function's return value can change + * needs that custom data layer. It can change required layers * depending on the modifier's settings. * * Note that this means extra data (e.g. vertex groups) - it is assumed * that all modifiers need mesh data and deform modifiers need vertex * coordinates. * - * Note that this limits the number of custom data layer types to 32. - * - * If this function is not present or it returns 0, it is assumed that - * no extra data is needed. + * If this function is not present, it is assumed that no extra data is needed. * * This function is optional. */ - CustomDataMask (*requiredDataMask)(struct Object *ob, struct ModifierData *md); + void (*requiredDataMask)(struct Object *ob, struct ModifierData *md, struct CustomData_MeshMasks *r_cddata_masks); /* Free internal modifier data variables, this function should * not free the md variable itself. @@ -365,10 +363,10 @@ bool modifiers_isPreview(struct Object *ob); typedef struct CDMaskLink { struct CDMaskLink *next; - CustomDataMask mask; + struct CustomData_MeshMasks mask; } CDMaskLink; -/* Calculates and returns a linked list of CustomDataMasks indicating the +/* Calculates and returns a linked list of CustomData_MeshMasks indicating the * data required by each modifier in the stack pointed to by md for correct * evaluation, assuming the data indicated by dataMask is required at the * end of the stack. @@ -376,9 +374,10 @@ typedef struct CDMaskLink { struct CDMaskLink *modifiers_calcDataMasks(struct Scene *scene, struct Object *ob, struct ModifierData *md, - CustomDataMask dataMask, + const struct CustomData_MeshMasks *dataMask, int required_mode, - ModifierData *previewmd, CustomDataMask previewmask); + ModifierData *previewmd, + const struct CustomData_MeshMasks *previewmask); struct ModifierData *modifiers_getLastPreview(struct Scene *scene, struct ModifierData *md, int required_mode); diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 715d8670071..19036e63a8c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -41,6 +41,7 @@ struct ParticleSystemModifierData; struct BVHTreeRay; struct BVHTreeRayHit; +struct CustomData_MeshMasks; struct Depsgraph; struct Depsgraph; struct EdgeHash; @@ -333,7 +334,7 @@ void psys_interpolate_mcol(const struct MCol *mcol, int quad, const float w[4], void copy_particle_key(struct ParticleKey *to, struct ParticleKey *from, int time); -CustomDataMask psys_emitter_customdata_mask(struct ParticleSystem *psys); +void psys_emitter_customdata_mask(struct ParticleSystem *psys, struct CustomData_MeshMasks *r_cddata_masks); void psys_particle_on_emitter(struct ParticleSystemModifierData *psmd, int distr, int index, int index_dmcache, float fuv[4], float foffset, float vec[3], float nor[3], float utan[3], float vtan[3], float orco[3]); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 27da5b8c635..a3f89d65c5a 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -28,6 +28,7 @@ #include "MEM_guardedalloc.h" #include "DNA_cloth_types.h" +#include "DNA_customdata_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" @@ -361,13 +362,13 @@ void DM_from_template_ex( DerivedMesh *dm, DerivedMesh *source, DerivedMeshType type, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys, - CustomDataMask mask) + const CustomData_MeshMasks *mask) { - CustomData_copy(&source->vertData, &dm->vertData, mask, CD_CALLOC, numVerts); - CustomData_copy(&source->edgeData, &dm->edgeData, mask, CD_CALLOC, numEdges); - CustomData_copy(&source->faceData, &dm->faceData, mask, CD_CALLOC, numTessFaces); - CustomData_copy(&source->loopData, &dm->loopData, mask, CD_CALLOC, numLoops); - CustomData_copy(&source->polyData, &dm->polyData, mask, CD_CALLOC, numPolys); + CustomData_copy(&source->vertData, &dm->vertData, mask->vmask, CD_CALLOC, numVerts); + CustomData_copy(&source->edgeData, &dm->edgeData, mask->emask, CD_CALLOC, numEdges); + CustomData_copy(&source->faceData, &dm->faceData, mask->fmask, CD_CALLOC, numTessFaces); + CustomData_copy(&source->loopData, &dm->loopData, mask->lmask, CD_CALLOC, numLoops); + CustomData_copy(&source->polyData, &dm->polyData, mask->pmask, CD_CALLOC, numPolys); dm->cd_flag = source->cd_flag; @@ -392,7 +393,7 @@ void DM_from_template( dm, source, type, numVerts, numEdges, numTessFaces, numLoops, numPolys, - CD_MASK_DERIVEDMESH); + &CD_MASK_DERIVEDMESH); } int DM_release(DerivedMesh *dm) @@ -433,8 +434,8 @@ void DM_DupPolys(DerivedMesh *source, DerivedMesh *target) CustomData_free(&target->loopData, source->numLoopData); CustomData_free(&target->polyData, source->numPolyData); - CustomData_copy(&source->loopData, &target->loopData, CD_MASK_DERIVEDMESH, CD_DUPLICATE, source->numLoopData); - CustomData_copy(&source->polyData, &target->polyData, CD_MASK_DERIVEDMESH, CD_DUPLICATE, source->numPolyData); + CustomData_copy(&source->loopData, &target->loopData, CD_MASK_DERIVEDMESH.lmask, CD_DUPLICATE, source->numLoopData); + CustomData_copy(&source->polyData, &target->polyData, CD_MASK_DERIVEDMESH.pmask, CD_DUPLICATE, source->numPolyData); target->numLoopData = source->numLoopData; target->numPolyData = source->numPolyData; @@ -492,7 +493,7 @@ void DM_ensure_looptri_data(DerivedMesh *dm) } } -void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool take_ownership) +void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, const CustomData_MeshMasks *mask, bool take_ownership) { /* dm might depend on me, so we need to do everything with a local copy */ Mesh tmp = *me; @@ -526,10 +527,10 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool totpoly = tmp.totpoly = dm->getNumPolys(dm); tmp.totface = 0; - CustomData_copy(&dm->vertData, &tmp.vdata, mask, alloctype, totvert); - CustomData_copy(&dm->edgeData, &tmp.edata, mask, alloctype, totedge); - CustomData_copy(&dm->loopData, &tmp.ldata, mask, alloctype, totloop); - CustomData_copy(&dm->polyData, &tmp.pdata, mask, alloctype, totpoly); + CustomData_copy(&dm->vertData, &tmp.vdata, mask->vmask, alloctype, totvert); + CustomData_copy(&dm->edgeData, &tmp.edata, mask->emask, alloctype, totedge); + CustomData_copy(&dm->loopData, &tmp.ldata, mask->lmask, alloctype, totloop); + CustomData_copy(&dm->polyData, &tmp.pdata, mask->pmask, alloctype, totpoly); tmp.cd_flag = dm->cd_flag; tmp.runtime.deformed_only = dm->deformedOnly; @@ -627,10 +628,10 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask, bool if (take_ownership) { if (alloctype == CD_ASSIGN) { - CustomData_free_typemask(&dm->vertData, dm->numVertData, ~mask); - CustomData_free_typemask(&dm->edgeData, dm->numEdgeData, ~mask); - CustomData_free_typemask(&dm->loopData, dm->numLoopData, ~mask); - CustomData_free_typemask(&dm->polyData, dm->numPolyData, ~mask); + CustomData_free_typemask(&dm->vertData, dm->numVertData, ~mask->vmask); + CustomData_free_typemask(&dm->edgeData, dm->numEdgeData, ~mask->emask); + CustomData_free_typemask(&dm->loopData, dm->numLoopData, ~mask->lmask); + CustomData_free_typemask(&dm->polyData, dm->numPolyData, ~mask->pmask); } dm->release(dm); } @@ -655,31 +656,31 @@ void BKE_mesh_runtime_eval_to_meshkey(Mesh *me_deformed, Mesh *me, KeyBlock *kb) * zero for the layer type, so only layer types specified by the mask * will be copied */ -void DM_set_only_copy(DerivedMesh *dm, CustomDataMask mask) +void DM_set_only_copy(DerivedMesh *dm, const CustomData_MeshMasks *mask) { - CustomData_set_only_copy(&dm->vertData, mask); - CustomData_set_only_copy(&dm->edgeData, mask); - CustomData_set_only_copy(&dm->faceData, mask); + CustomData_set_only_copy(&dm->vertData, mask->vmask); + CustomData_set_only_copy(&dm->edgeData, mask->emask); + CustomData_set_only_copy(&dm->faceData, mask->fmask); /* this wasn't in 2.63 and is disabled for 2.64 because it gives problems with * weight paint mode when there are modifiers applied, needs further investigation, * see replies to r50969, Campbell */ #if 0 - CustomData_set_only_copy(&dm->loopData, mask); - CustomData_set_only_copy(&dm->polyData, mask); + CustomData_set_only_copy(&dm->loopData, mask->lmask); + CustomData_set_only_copy(&dm->polyData, mask->pmask); #endif } -static void mesh_set_only_copy(Mesh *mesh, CustomDataMask mask) +static void mesh_set_only_copy(Mesh *mesh, const CustomData_MeshMasks *mask) { - CustomData_set_only_copy(&mesh->vdata, mask); - CustomData_set_only_copy(&mesh->edata, mask); - CustomData_set_only_copy(&mesh->fdata, mask); + CustomData_set_only_copy(&mesh->vdata, mask->vmask); + CustomData_set_only_copy(&mesh->edata, mask->emask); + CustomData_set_only_copy(&mesh->fdata, mask->fmask); /* this wasn't in 2.63 and is disabled for 2.64 because it gives problems with * weight paint mode when there are modifiers applied, needs further investigation, * see replies to r50969, Campbell */ #if 0 - CustomData_set_only_copy(&mesh->ldata, mask); - CustomData_set_only_copy(&mesh->pdata, mask); + CustomData_set_only_copy(&mesh->ldata, mask->lmask); + CustomData_set_only_copy(&mesh->pdata, mask->pmask); #endif } @@ -982,7 +983,7 @@ static Mesh *create_orco_mesh(Object *ob, Mesh *me, BMEditMesh *em, int layer) int free; if (em) { - mesh = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0); + mesh = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, NULL); } else { mesh = BKE_mesh_copy_for_eval(me, true); @@ -1152,7 +1153,7 @@ static void mesh_copy_autosmooth(Mesh *me, Mesh *me_orig) static void mesh_calc_modifiers( struct Depsgraph *depsgraph, Scene *scene, Object *ob, float (*inputVertexCos)[3], int useDeform, - const bool need_mapping, CustomDataMask dataMask, + const bool need_mapping, const CustomData_MeshMasks *dataMask, const int index, const bool useCache, const bool build_shapekey_layers, /* return args */ Mesh **r_deform, Mesh **r_final) @@ -1160,7 +1161,8 @@ static void mesh_calc_modifiers( ModifierData *firstmd, *md, *previewmd = NULL; CDMaskLink *datamasks, *curr; /* XXX Always copying POLYINDEX, else tessellated data are no more valid! */ - CustomDataMask mask, nextmask, previewmask = 0, append_mask = CD_MASK_ORIGINDEX | CD_MASK_BAREMESH; + CustomData_MeshMasks mask, nextmask, previewmask = {0}, append_mask = CD_MASK_BAREMESH_ORIGINDEX; + float (*deformedVerts)[3] = NULL; int numVerts = ((Mesh *)ob->data)->totvert; const bool useRenderParams = (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER); @@ -1206,7 +1208,7 @@ static void mesh_calc_modifiers( previewmd = modifiers_getLastPreview(scene, md, required_mode); } - datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, previewmd, previewmask); + datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, previewmd, &previewmask); curr = datamasks; if (r_deform) { @@ -1336,12 +1338,12 @@ static void mesh_calc_modifiers( } /* add an orco layer if needed by this modifier */ - if (mti->requiredDataMask) - mask = mti->requiredDataMask(ob, md); - else - mask = 0; + memset(&mask, 0, sizeof(mask)); + if (mti->requiredDataMask) { + mti->requiredDataMask(ob, md, &mask); + } - if (me && (mask & CD_MASK_ORCO)) { + if (me && (mask.vmask & CD_MASK_ORCO)) { add_orco_mesh(ob, NULL, me, me_orco, CD_ORCO); } @@ -1381,7 +1383,7 @@ static void mesh_calc_modifiers( if (curr->next) nextmask = curr->next->mask; else - nextmask = dataMask; + nextmask = *dataMask; /* apply vertex coordinates or build a Mesh as necessary */ if (me) { @@ -1408,7 +1410,7 @@ static void mesh_calc_modifiers( * requests it, this way Mirror, Solidify etc will keep ORIGINDEX * data by using generic DM_copy_vert_data() functions. */ - if (need_mapping || (nextmask & CD_MASK_ORIGINDEX)) { + if (need_mapping || ((nextmask.vmask | nextmask.emask | nextmask.pmask) & CD_MASK_ORIGINDEX)) { /* calc */ CustomData_add_layer(&me->vdata, CD_ORIGINDEX, CD_CALLOC, NULL, me->totvert); CustomData_add_layer(&me->edata, CD_ORIGINDEX, CD_CALLOC, NULL, me->totedge); @@ -1426,15 +1428,21 @@ static void mesh_calc_modifiers( mask = curr->mask; /* needMapping check here fixes bug [#28112], otherwise it's * possible that it won't be copied */ - mask |= append_mask; - mesh_set_only_copy(me, mask | (need_mapping ? CD_MASK_ORIGINDEX : 0)); + CustomData_MeshMasks_update(&mask, &append_mask); + if (need_mapping) { + mask.vmask |= CD_MASK_ORIGINDEX; + mask.emask |= CD_MASK_ORIGINDEX; + mask.pmask |= CD_MASK_ORIGINDEX; + } + mesh_set_only_copy(me, &mask); /* add cloth rest shape key if needed */ - if (mask & CD_MASK_CLOTH_ORCO) + if (mask.vmask & CD_MASK_CLOTH_ORCO) { add_orco_mesh(ob, NULL, me, me_orco, CD_CLOTH_ORCO); + } /* add an origspace layer if needed */ - if ((curr->mask) & CD_MASK_ORIGSPACE_MLOOP) { + if ((curr->mask.lmask) & CD_MASK_ORIGSPACE_MLOOP) { if (!CustomData_has_layer(&me->ldata, CD_ORIGSPACE_MLOOP)) { CustomData_add_layer(&me->ldata, CD_ORIGSPACE_MLOOP, CD_CALLOC, NULL, me->totloop); mesh_init_origspace(me); @@ -1463,15 +1471,18 @@ static void mesh_calc_modifiers( } /* create an orco mesh in parallel */ - if (nextmask & CD_MASK_ORCO) { + if (nextmask.vmask & CD_MASK_ORCO) { if (!me_orco) { me_orco = create_orco_mesh(ob, ob->data, NULL, CD_ORCO); } - nextmask &= ~CD_MASK_ORCO; - mesh_set_only_copy(me_orco, nextmask | CD_MASK_ORIGINDEX | - (mti->requiredDataMask ? - mti->requiredDataMask(ob, md) : 0)); + nextmask.vmask &= ~CD_MASK_ORCO; + CustomData_MeshMasks temp_cddata_masks = {.vmask=CD_MASK_ORIGINDEX, .emask=CD_MASK_ORIGINDEX, .fmask=CD_MASK_ORIGINDEX, .pmask=CD_MASK_ORIGINDEX}; + if (mti->requiredDataMask != NULL) { + mti->requiredDataMask(ob, md, &temp_cddata_masks); + } + CustomData_MeshMasks_update(&temp_cddata_masks, &nextmask); + mesh_set_only_copy(me_orco, &temp_cddata_masks); me_next = modwrap_applyModifier(md, &mectx_orco, me_orco); ASSERT_IS_VALID_MESH(me_next); @@ -1488,13 +1499,16 @@ static void mesh_calc_modifiers( } /* create cloth orco mesh in parallel */ - if (nextmask & CD_MASK_CLOTH_ORCO) { + if (nextmask.vmask & CD_MASK_CLOTH_ORCO) { if (!me_orco_cloth) { me_orco_cloth = create_orco_mesh(ob, ob->data, NULL, CD_CLOTH_ORCO); } - nextmask &= ~CD_MASK_CLOTH_ORCO; - mesh_set_only_copy(me_orco_cloth, nextmask | CD_MASK_ORIGINDEX); + nextmask.vmask &= ~CD_MASK_CLOTH_ORCO; + nextmask.vmask |= CD_MASK_ORIGINDEX; + nextmask.emask |= CD_MASK_ORIGINDEX; + nextmask.pmask |= CD_MASK_ORIGINDEX; + mesh_set_only_copy(me_orco_cloth, &nextmask); me_next = modwrap_applyModifier(md, &mectx_orco, me_orco_cloth); ASSERT_IS_VALID_MESH(me_next); @@ -1512,8 +1526,9 @@ static void mesh_calc_modifiers( /* in case of dynamic paint, make sure preview mask remains for following modifiers */ /* XXX Temp and hackish solution! */ - if (md->type == eModifierType_DynamicPaint) - append_mask |= CD_MASK_PREVIEW_MLOOPCOL; + if (md->type == eModifierType_DynamicPaint) { + append_mask.lmask |= CD_MASK_PREVIEW_MLOOPCOL; + } me->runtime.deformed_only = false; } @@ -1556,7 +1571,7 @@ static void mesh_calc_modifiers( } /* add an orco layer if needed */ - if (dataMask & CD_MASK_ORCO) { + if (dataMask->vmask & CD_MASK_ORCO) { add_orco_mesh(ob, NULL, *r_final, me_orco, CD_ORCO); if (r_deform && *r_deform) @@ -1571,7 +1586,7 @@ static void mesh_calc_modifiers( if (sculpt_dyntopo == false) { /* watch this! after 2.75a we move to from tessface to looptri (by default) */ - if (dataMask & CD_MASK_MFACE) { + if (dataMask->fmask & CD_MASK_MFACE) { BKE_mesh_tessface_ensure(*r_final); } @@ -1613,7 +1628,7 @@ static void mesh_calc_modifiers( static void mesh_calc_modifiers_dm( struct Depsgraph *depsgraph, Scene *scene, Object *ob, float (*inputVertexCos)[3], int useDeform, - const bool need_mapping, CustomDataMask dataMask, + const bool need_mapping, const CustomData_MeshMasks *dataMask, const int index, const bool useCache, const bool build_shapekey_layers, /* return args */ DerivedMesh **r_deformdm, DerivedMesh **r_finaldm) @@ -1626,11 +1641,11 @@ static void mesh_calc_modifiers_dm( (r_deformdm ? &deform_mesh : NULL), &final_mesh); if (deform_mesh) { - *r_deformdm = CDDM_from_mesh_ex(deform_mesh, CD_DUPLICATE, CD_MASK_MESH); + *r_deformdm = CDDM_from_mesh_ex(deform_mesh, CD_DUPLICATE, &CD_MASK_MESH); BKE_id_free(NULL, deform_mesh); } - *r_finaldm = CDDM_from_mesh_ex(final_mesh, CD_DUPLICATE, CD_MASK_MESH); + *r_finaldm = CDDM_from_mesh_ex(final_mesh, CD_DUPLICATE, &CD_MASK_MESH); BKE_id_free(NULL, final_mesh); } #endif @@ -1672,13 +1687,13 @@ bool editbmesh_modifier_is_enabled(Scene *scene, ModifierData *md, bool has_prev static void editbmesh_calc_modifiers( struct Depsgraph *depsgraph, Scene *scene, Object *ob, - BMEditMesh *em, CustomDataMask dataMask, + BMEditMesh *em, const CustomData_MeshMasks *dataMask, /* return args */ Mesh **r_cage, Mesh **r_final) { ModifierData *md; float (*deformedVerts)[3] = NULL; - CustomDataMask mask = 0, append_mask = CD_MASK_BAREMESH; + CustomData_MeshMasks mask = {0}, append_mask = CD_MASK_BAREMESH; int i, numVerts = 0, cageIndex = modifiers_getCageIndex(scene, ob, NULL, 1); CDMaskLink *datamasks, *curr; const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; @@ -1702,7 +1717,7 @@ static void editbmesh_calc_modifiers( md = modifiers_getVirtualModifierList(ob, &virtualModifierData); /* copied from mesh_calc_modifiers */ - datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, NULL, 0); + datamasks = modifiers_calcDataMasks(scene, ob, md, dataMask, required_mode, NULL, NULL); curr = datamasks; @@ -1711,6 +1726,7 @@ static void editbmesh_calc_modifiers( for (i = 0; md; i++, md = md->next, curr = curr->next) { const ModifierTypeInfo *mti = modifierType_getInfo(md->type); + memset(&mask, 0, sizeof(mask)); if (!editbmesh_modifier_is_enabled(scene, md, me != NULL)) { continue; @@ -1718,8 +1734,8 @@ static void editbmesh_calc_modifiers( /* add an orco layer if needed by this modifier */ if (me && mti->requiredDataMask) { - mask = mti->requiredDataMask(ob, md); - if (mask & CD_MASK_ORCO) { + mti->requiredDataMask(ob, md, &mask); + if (mask.vmask & CD_MASK_ORCO) { add_orco_mesh(ob, em, me, me_orco, CD_ORCO); } } @@ -1770,7 +1786,7 @@ static void editbmesh_calc_modifiers( } else { - me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, 0); + me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, NULL); ASSERT_IS_VALID_MESH(me); mesh_copy_autosmooth(me, ob->data); @@ -1782,13 +1798,16 @@ static void editbmesh_calc_modifiers( /* create an orco derivedmesh in parallel */ mask = curr->mask; - if (mask & CD_MASK_ORCO) { + if (mask.vmask & CD_MASK_ORCO) { if (!me_orco) { me_orco = create_orco_mesh(ob, ob->data, em, CD_ORCO); } - mask &= ~CD_MASK_ORCO; - mesh_set_only_copy(me_orco, mask | CD_MASK_ORIGINDEX); + mask.vmask &= ~CD_MASK_ORCO; + mask.vmask |= CD_MASK_ORIGINDEX; + mask.emask |= CD_MASK_ORIGINDEX; + mask.pmask |= CD_MASK_ORIGINDEX; + mesh_set_only_copy(me_orco, &mask); me_next = modwrap_applyModifier(md, &mectx_orco, me_orco); ASSERT_IS_VALID_MESH(me_next); @@ -1803,12 +1822,15 @@ static void editbmesh_calc_modifiers( } /* set the DerivedMesh to only copy needed data */ - mask |= append_mask; - mask = curr->mask; /* CD_MASK_ORCO may have been cleared above */ + CustomData_MeshMasks_update(&mask, &append_mask); + mask = curr->mask; /* CD_MASK_ORCO may have been cleared above */ /* XXX WHAT? ovewrites mask ??? */ + mask.vmask |= CD_MASK_ORIGINDEX; + mask.emask |= CD_MASK_ORIGINDEX; + mask.pmask |= CD_MASK_ORIGINDEX; - mesh_set_only_copy(me, mask | CD_MASK_ORIGINDEX); + mesh_set_only_copy(me, &mask); - if (mask & CD_MASK_ORIGSPACE_MLOOP) { + if (mask.lmask & CD_MASK_ORIGSPACE_MLOOP) { if (!CustomData_has_layer(&me->ldata, CD_ORIGSPACE_MLOOP)) { CustomData_add_layer(&me->ldata, CD_ORIGSPACE_MLOOP, CD_CALLOC, NULL, me->totloop); mesh_init_origspace(me); @@ -1849,7 +1871,7 @@ static void editbmesh_calc_modifiers( me_orig->runtime.edit_data->vertexCos = MEM_dupallocN(deformedVerts); } *r_cage = BKE_mesh_from_editmesh_with_coords_thin_wrap( - em, mask, + em, &mask, deformedVerts ? MEM_dupallocN(deformedVerts) : NULL); mesh_copy_autosmooth(*r_cage, ob->data); } @@ -1909,7 +1931,7 @@ static void editbmesh_calc_modifiers( * but don't recalculate if the last modifier in the stack gives us tessfaces * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential * but quiets annoying error messages since tessfaces wont be created. */ - if (dataMask & CD_MASK_MFACE) { + if (dataMask->fmask & CD_MASK_MFACE) { if ((*r_final)->edit_mesh == NULL) { BKE_mesh_tessface_ensure(*r_final); } @@ -1942,7 +1964,7 @@ static void editbmesh_calc_modifiers( } /* add an orco layer if needed */ - if (dataMask & CD_MASK_ORCO) + if (dataMask->vmask & CD_MASK_ORCO) add_orco_mesh(ob, em, *r_final, me_orco, CD_ORCO); if (me_orco) { @@ -2014,7 +2036,7 @@ static void mesh_runtime_check_normals_valid(const Mesh *mesh) } static void mesh_build_data( - struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask, + struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask, const bool build_shapekey_layers, const bool need_mapping) { BLI_assert(ob->type == OB_MESH); @@ -2026,10 +2048,14 @@ static void mesh_build_data( BKE_object_free_derived_caches(ob); BKE_object_sculpt_modifiers_changed(ob); +#if 0 /* XXX This is already taken care of in mesh_calc_modifiers()... */ if (need_mapping) { /* Also add the flag so that it is recorded in lastDataMask. */ - dataMask |= CD_MASK_ORIGINDEX; + dataMask->vmask |= CD_MASK_ORIGINDEX; + dataMask->emask |= CD_MASK_ORIGINDEX; + dataMask->pmask |= CD_MASK_ORIGINDEX; } +#endif mesh_calc_modifiers( depsgraph, scene, ob, NULL, 1, need_mapping, dataMask, -1, true, build_shapekey_layers, @@ -2037,8 +2063,8 @@ static void mesh_build_data( #ifdef USE_DERIVEDMESH /* TODO(campbell): remove these copies, they are expected in various places over the code. */ - ob->derivedDeform = CDDM_from_mesh_ex(ob->runtime.mesh_deform_eval, CD_REFERENCE, CD_MASK_MESH); - ob->derivedFinal = CDDM_from_mesh_ex(ob->runtime.mesh_eval, CD_REFERENCE, CD_MASK_MESH); + ob->derivedDeform = CDDM_from_mesh_ex(ob->runtime.mesh_deform_eval, CD_REFERENCE, &CD_MASK_MESH); + ob->derivedFinal = CDDM_from_mesh_ex(ob->runtime.mesh_eval, CD_REFERENCE, &CD_MASK_MESH); #endif BKE_object_boundbox_calc_from_mesh(ob, ob->runtime.mesh_eval); @@ -2054,7 +2080,7 @@ static void mesh_build_data( ob->derivedFinal->needsFree = 0; ob->derivedDeform->needsFree = 0; #endif - ob->runtime.last_data_mask = dataMask; + ob->runtime.last_data_mask = *dataMask; ob->runtime.last_need_mapping = need_mapping; if ((ob->mode & OB_MODE_ALL_SCULPT) && ob->sculpt) { @@ -2071,7 +2097,7 @@ static void mesh_build_data( static void editbmesh_build_data( struct Depsgraph *depsgraph, Scene *scene, - Object *obedit, BMEditMesh *em, CustomDataMask dataMask) + Object *obedit, BMEditMesh *em, CustomData_MeshMasks *dataMask) { BLI_assert(em->ob->id.tag & LIB_TAG_COPIED_ON_WRITE); @@ -2092,16 +2118,17 @@ static void editbmesh_build_data( BKE_object_boundbox_calc_from_mesh(obedit, em->mesh_eval_final); - em->lastDataMask = dataMask; + em->lastDataMask = *dataMask; mesh_runtime_check_normals_valid(em->mesh_eval_final); } -static CustomDataMask object_get_datamask(const Depsgraph *depsgraph, Object *ob, bool *r_need_mapping) +static void object_get_datamask(const Depsgraph *depsgraph, Object *ob, CustomData_MeshMasks *r_mask, bool *r_need_mapping) { ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); Object *actob = view_layer->basact ? DEG_get_original_object(view_layer->basact->object) : NULL; - CustomDataMask mask = DEG_get_customdata_mask_for_object(depsgraph, ob); + + DEG_get_customdata_mask_for_object(depsgraph, ob, r_mask); if (r_need_mapping) { *r_need_mapping = false; @@ -2117,37 +2144,37 @@ static CustomDataMask object_get_datamask(const Depsgraph *depsgraph, Object *ob /* check if we need tfaces & mcols due to face select or texture paint */ if ((ob->mode & OB_MODE_TEXTURE_PAINT) || editing) { - mask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MTFACE; + r_mask->lmask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL; + r_mask->fmask |= CD_MASK_MTFACE; } /* check if we need mcols due to vertex paint or weightpaint */ if (ob->mode & OB_MODE_VERTEX_PAINT) { - mask |= CD_MASK_MLOOPCOL; + r_mask->lmask |= CD_MASK_MLOOPCOL; } if (ob->mode & OB_MODE_WEIGHT_PAINT) { - mask |= CD_MASK_MDEFORMVERT; + r_mask->vmask |= CD_MASK_MDEFORMVERT; } if (ob->mode & OB_MODE_EDIT) - mask |= CD_MASK_MVERT_SKIN; + r_mask->vmask |= CD_MASK_MVERT_SKIN; } - - return mask; } void makeDerivedMesh( struct Depsgraph *depsgraph, Scene *scene, Object *ob, BMEditMesh *em, - CustomDataMask dataMask, const bool build_shapekey_layers) + const CustomData_MeshMasks *dataMask, const bool build_shapekey_layers) { bool need_mapping; - dataMask |= object_get_datamask(depsgraph, ob, &need_mapping); + CustomData_MeshMasks cddata_masks = *dataMask; + object_get_datamask(depsgraph, ob, &cddata_masks, &need_mapping); if (em) { - editbmesh_build_data(depsgraph, scene, ob, em, dataMask); + editbmesh_build_data(depsgraph, scene, ob, em, &cddata_masks); } else { - mesh_build_data(depsgraph, scene, ob, dataMask, build_shapekey_layers, need_mapping); + mesh_build_data(depsgraph, scene, ob, &cddata_masks, build_shapekey_layers, need_mapping); } } @@ -2156,27 +2183,27 @@ void makeDerivedMesh( #ifdef USE_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_final'. */ DerivedMesh *mesh_get_derived_final( - struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) + struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { /* if there's no derived mesh or the last data mask used doesn't include * the data we need, rebuild the derived mesh */ bool need_mapping; - dataMask |= object_get_datamask(depsgraph, ob, &need_mapping); + CustomData_MeshMasks cddata_masks = *dataMask; + object_get_datamask(depsgraph, ob, &cddata_masks, &need_mapping); if (!ob->derivedFinal || - ((dataMask & ob->lastDataMask) != dataMask) || + !CustomData_MeshMasks_are_matching(&(ob->lastDataMask), &cddata_masks) || (need_mapping != ob->lastNeedMapping)) { - mesh_build_data(depsgraph, scene, ob, dataMask, false, need_mapping); + mesh_build_data(depsgraph, scene, ob, cddata_masks, false, need_mapping); } if (ob->derivedFinal) { BLI_assert(!(ob->derivedFinal->dirty & DM_DIRTY_NORMALS)); } return ob->derivedFinal; } #endif -Mesh *mesh_get_eval_final( - struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) +Mesh *mesh_get_eval_final(struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { /* This function isn't thread-safe and can't be used during evaluation. */ BLI_assert(DEG_debug_is_evaluating(depsgraph) == false); @@ -2189,13 +2216,15 @@ Mesh *mesh_get_eval_final( * the data we need, rebuild the derived mesh */ bool need_mapping; - dataMask |= object_get_datamask(depsgraph, ob, &need_mapping); + CustomData_MeshMasks cddata_masks = *dataMask; + object_get_datamask(depsgraph, ob, &cddata_masks, &need_mapping); if (!ob->runtime.mesh_eval || - ((dataMask & ob->runtime.last_data_mask) != dataMask) || + !CustomData_MeshMasks_are_matching(&(ob->runtime.last_data_mask), &cddata_masks) || (need_mapping && !ob->runtime.last_need_mapping)) { - mesh_build_data(depsgraph, scene, ob, dataMask | ob->runtime.last_data_mask, + CustomData_MeshMasks_update(&cddata_masks, &ob->runtime.last_data_mask); + mesh_build_data(depsgraph, scene, ob, &cddata_masks, false, need_mapping || ob->runtime.last_need_mapping); } @@ -2205,26 +2234,27 @@ Mesh *mesh_get_eval_final( #ifdef USE_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_deform' instead. */ -DerivedMesh *mesh_get_derived_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) +DerivedMesh *mesh_get_derived_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { /* if there's no derived mesh or the last data mask used doesn't include * the data we need, rebuild the derived mesh */ bool need_mapping; - dataMask |= object_get_datamask(depsgraph, ob, &need_mapping); + CustomData_MeshMasks cddata_masks = *dataMask; + object_get_datamask(depsgraph, ob, &cddata_masks, &need_mapping); if (!ob->derivedDeform || - ((dataMask & ob->lastDataMask) != dataMask) || + !CustomData_MeshMasks_are_matching(&(ob->lastDataMask), &cddata_masks) || (need_mapping != ob->lastNeedMapping)) { - mesh_build_data(depsgraph, scene, ob, dataMask, false, need_mapping); + mesh_build_data(depsgraph, scene, ob, cddata_masks, false, need_mapping); } return ob->derivedDeform; } #endif -Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) +Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { /* This function isn't thread-safe and can't be used during evaluation. */ BLI_assert(DEG_debug_is_evaluating(depsgraph) == false); @@ -2238,13 +2268,15 @@ Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob */ bool need_mapping; - dataMask |= object_get_datamask(depsgraph, ob, &need_mapping); + CustomData_MeshMasks cddata_masks = *dataMask; + object_get_datamask(depsgraph, ob, &cddata_masks, &need_mapping); if (!ob->runtime.mesh_deform_eval || - ((dataMask & ob->runtime.last_data_mask) != dataMask) || + !CustomData_MeshMasks_are_matching(&(ob->runtime.last_data_mask), &cddata_masks) || (need_mapping && !ob->runtime.last_need_mapping)) { - mesh_build_data(depsgraph, scene, ob, dataMask | ob->runtime.last_data_mask, + CustomData_MeshMasks_update(&cddata_masks, &ob->runtime.last_data_mask); + mesh_build_data(depsgraph, scene, ob, &cddata_masks, false, need_mapping || ob->runtime.last_need_mapping); } @@ -2254,7 +2286,8 @@ Mesh *mesh_get_eval_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob #ifdef USE_DERIVEDMESH /* Deprecated, use `mesh_create_eval_final_render` instead. */ -DerivedMesh *mesh_create_derived_render(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) +DerivedMesh *mesh_create_derived_render( + struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { DerivedMesh *final; @@ -2265,7 +2298,7 @@ DerivedMesh *mesh_create_derived_render(struct Depsgraph *depsgraph, Scene *scen return final; } #endif -Mesh *mesh_create_eval_final_render(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) +Mesh *mesh_create_eval_final_render(Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask) { Mesh *final; @@ -2278,7 +2311,8 @@ Mesh *mesh_create_eval_final_render(struct Depsgraph *depsgraph, Scene *scene, O #ifdef USE_DERIVEDMESH /* Deprecated, use `mesh_create_eval_final_index_render` instead. */ -DerivedMesh *mesh_create_derived_index_render(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask, int index) +DerivedMesh *mesh_create_derived_index_render( + struct Depsgraph *depsgraph, Scene *scene, Object *ob, const CustomData_MeshMasks *dataMask, int index) { DerivedMesh *final; @@ -2290,8 +2324,8 @@ DerivedMesh *mesh_create_derived_index_render(struct Depsgraph *depsgraph, Scene } #endif Mesh *mesh_create_eval_final_index_render( - struct Depsgraph *depsgraph, struct Scene *scene, - struct Object *ob, CustomDataMask dataMask, int index) + Depsgraph *depsgraph, Scene *scene, + Object *ob, const CustomData_MeshMasks *dataMask, int index) { Mesh *final; @@ -2306,7 +2340,7 @@ Mesh *mesh_create_eval_final_index_render( /* Deprecated, use `mesh_create_eval_final_view` instead. */ DerivedMesh *mesh_create_derived_view( struct Depsgraph *depsgraph, Scene *scene, - Object *ob, CustomDataMask dataMask) + Object *ob, const CustomData_MeshMasks *dataMask) { DerivedMesh *final; @@ -2327,8 +2361,8 @@ DerivedMesh *mesh_create_derived_view( #endif Mesh *mesh_create_eval_final_view( - struct Depsgraph *depsgraph, Scene *scene, - Object *ob, CustomDataMask dataMask) + Depsgraph *depsgraph, Scene *scene, + Object *ob, const CustomData_MeshMasks *dataMask) { Mesh *final; @@ -2348,8 +2382,8 @@ Mesh *mesh_create_eval_final_view( } Mesh *mesh_create_eval_no_deform( - struct Depsgraph *depsgraph, Scene *scene, Object *ob, - float (*vertCos)[3], CustomDataMask dataMask) + Depsgraph *depsgraph, Scene *scene, Object *ob, + float (*vertCos)[3], const CustomData_MeshMasks *dataMask) { Mesh *final; @@ -2361,8 +2395,8 @@ Mesh *mesh_create_eval_no_deform( } Mesh *mesh_create_eval_no_deform_render( - struct Depsgraph *depsgraph, Scene *scene, Object *ob, - float (*vertCos)[3], CustomDataMask dataMask) + Depsgraph *depsgraph, Scene *scene, Object *ob, + float (*vertCos)[3], const CustomData_MeshMasks *dataMask) { Mesh *final; @@ -2376,20 +2410,22 @@ Mesh *mesh_create_eval_no_deform_render( /***/ Mesh *editbmesh_get_eval_cage_and_final( - struct Depsgraph *depsgraph, Scene *scene, Object *obedit, BMEditMesh *em, - CustomDataMask dataMask, + Depsgraph *depsgraph, Scene *scene, Object *obedit, BMEditMesh *em, + const CustomData_MeshMasks *dataMask, /* return args */ Mesh **r_final) { + CustomData_MeshMasks cddata_masks = *dataMask; + /* if there's no derived mesh or the last data mask used doesn't include * the data we need, rebuild the derived mesh */ - dataMask |= object_get_datamask(depsgraph, obedit, NULL); + object_get_datamask(depsgraph, obedit, &cddata_masks, NULL); if (!em->mesh_eval_cage || - (em->lastDataMask & dataMask) != dataMask) + !CustomData_MeshMasks_are_matching(&(em->lastDataMask), &cddata_masks)) { - editbmesh_build_data(depsgraph, scene, obedit, em, dataMask); + editbmesh_build_data(depsgraph, scene, obedit, em, &cddata_masks); } *r_final = em->mesh_eval_final; @@ -2399,17 +2435,19 @@ Mesh *editbmesh_get_eval_cage_and_final( Mesh *editbmesh_get_eval_cage( struct Depsgraph *depsgraph, Scene *scene, Object *obedit, BMEditMesh *em, - CustomDataMask dataMask) + const CustomData_MeshMasks *dataMask) { + CustomData_MeshMasks cddata_masks = *dataMask; + /* if there's no derived mesh or the last data mask used doesn't include * the data we need, rebuild the derived mesh */ - dataMask |= object_get_datamask(depsgraph, obedit, NULL); + object_get_datamask(depsgraph, obedit, &cddata_masks, NULL); if (!em->mesh_eval_cage || - (em->lastDataMask & dataMask) != dataMask) + !CustomData_MeshMasks_are_matching(&(em->lastDataMask), &cddata_masks)) { - editbmesh_build_data(depsgraph, scene, obedit, em, dataMask); + editbmesh_build_data(depsgraph, scene, obedit, em, &cddata_masks); } return em->mesh_eval_cage; @@ -2417,7 +2455,7 @@ Mesh *editbmesh_get_eval_cage( Mesh *editbmesh_get_eval_cage_from_orig( struct Depsgraph *depsgraph, Scene *scene, Object *obedit, BMEditMesh *UNUSED(em), - CustomDataMask dataMask) + const CustomData_MeshMasks *dataMask) { BLI_assert((obedit->id.tag & LIB_TAG_COPIED_ON_WRITE) == 0); Scene *scene_eval = (Scene *)DEG_get_evaluated_id(depsgraph, &scene->id); @@ -2467,7 +2505,7 @@ DMCoNo *mesh_get_mapped_verts_nors(Scene *scene, Object *ob) if (ob->type != OB_MESH || me->totvert == 0) return NULL; - dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH | CD_MASK_ORIGINDEX); + dm = mesh_get_derived_final(scene, ob, &CD_MASK_BAREMESH_ORIGINDEX); if (dm->foreachMappedVert) { vertexcosnos = MEM_calloc_arrayN(me->totvert, sizeof(DMCoNo), "vertexcosnos map"); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index cb4118b6abb..859c5534183 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -582,15 +582,16 @@ DerivedMesh *CDDM_new(int numVerts, int numEdges, int numTessFaces, int numLoops DerivedMesh *CDDM_from_mesh(Mesh *mesh) { - return CDDM_from_mesh_ex(mesh, CD_REFERENCE, CD_MASK_MESH); + return CDDM_from_mesh_ex(mesh, CD_REFERENCE, &CD_MASK_MESH); } -DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, eCDAllocType alloctype, CustomDataMask mask) +DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, eCDAllocType alloctype, const CustomData_MeshMasks *mask) { CDDerivedMesh *cddm = cdDM_create(__func__); DerivedMesh *dm = &cddm->dm; + CustomData_MeshMasks cddata_masks = *mask; - mask &= ~CD_MASK_MDISPS; + cddata_masks.lmask &= ~CD_MASK_MDISPS; /* this does a referenced copy, with an exception for fluidsim */ @@ -608,15 +609,15 @@ DerivedMesh *CDDM_from_mesh_ex(Mesh *mesh, eCDAllocType alloctype, CustomDataMas } /* TODO DM_DIRTY_TESS_CDLAYERS ? Maybe not though, since we probably want to switch to looptris ? */ - CustomData_merge(&mesh->vdata, &dm->vertData, mask, alloctype, + CustomData_merge(&mesh->vdata, &dm->vertData, cddata_masks.vmask, alloctype, mesh->totvert); - CustomData_merge(&mesh->edata, &dm->edgeData, mask, alloctype, + CustomData_merge(&mesh->edata, &dm->edgeData, cddata_masks.emask, alloctype, mesh->totedge); - CustomData_merge(&mesh->fdata, &dm->faceData, mask | CD_MASK_ORIGINDEX, alloctype, + CustomData_merge(&mesh->fdata, &dm->faceData, cddata_masks.fmask | CD_MASK_ORIGINDEX, alloctype, 0 /* mesh->totface */); - CustomData_merge(&mesh->ldata, &dm->loopData, mask, alloctype, + CustomData_merge(&mesh->ldata, &dm->loopData, cddata_masks.lmask, alloctype, mesh->totloop); - CustomData_merge(&mesh->pdata, &dm->polyData, mask, alloctype, + CustomData_merge(&mesh->pdata, &dm->polyData, cddata_masks.pmask, alloctype, mesh->totpoly); cddm->mvert = CustomData_get_layer(&dm->vertData, CD_MVERT); @@ -767,7 +768,7 @@ static DerivedMesh *cddm_from_bmesh_ex( int numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL); int numUV = CustomData_number_of_layers(&bm->ldata, CD_MLOOPUV); int *index, add_orig; - CustomDataMask mask; + CustomData_MeshMasks mask = {0}; unsigned int i, j; const int cd_vert_bweight_offset = CustomData_get_offset(&bm->vdata, CD_BWEIGHT); @@ -779,18 +780,21 @@ static DerivedMesh *cddm_from_bmesh_ex( /* don't add origindex layer if one already exists */ add_orig = !CustomData_has_layer(&bm->pdata, CD_ORIGINDEX); - mask = use_mdisps ? CD_MASK_DERIVEDMESH | CD_MASK_MDISPS : CD_MASK_DERIVEDMESH; + mask = CD_MASK_DERIVEDMESH; + if (use_mdisps) { + mask.lmask |= CD_MASK_MDISPS; + } /* don't process shapekeys, we only feed them through the modifier stack as needed, * e.g. for applying modifiers or the like*/ - mask &= ~CD_MASK_SHAPEKEY; - CustomData_merge(&bm->vdata, &dm->vertData, mask, + mask.vmask &= ~CD_MASK_SHAPEKEY; + CustomData_merge(&bm->vdata, &dm->vertData, mask.vmask, CD_CALLOC, dm->numVertData); - CustomData_merge(&bm->edata, &dm->edgeData, mask, + CustomData_merge(&bm->edata, &dm->edgeData, mask.emask, CD_CALLOC, dm->numEdgeData); - CustomData_merge(&bm->ldata, &dm->loopData, mask, + CustomData_merge(&bm->ldata, &dm->loopData, mask.lmask, CD_CALLOC, dm->numLoopData); - CustomData_merge(&bm->pdata, &dm->polyData, mask, + CustomData_merge(&bm->pdata, &dm->polyData, mask.pmask, CD_CALLOC, dm->numPolyData); /* add tessellation mface layers */ @@ -974,11 +978,10 @@ DerivedMesh *CDDM_copy(DerivedMesh *source) /* note, the CD_ORIGINDEX layers are all 0, so if there is a direct * relationship between mesh data this needs to be set by the caller. */ -DerivedMesh *CDDM_from_template_ex( - DerivedMesh *source, +DerivedMesh *CDDM_from_template_ex(DerivedMesh *source, int numVerts, int numEdges, int numTessFaces, int numLoops, int numPolys, - CustomDataMask mask) + const CustomData_MeshMasks *mask) { CDDerivedMesh *cddm = cdDM_create("CDDM_from_template dest"); DerivedMesh *dm = &cddm->dm; @@ -1026,7 +1029,7 @@ DerivedMesh *CDDM_from_template( return CDDM_from_template_ex( source, numVerts, numEdges, numTessFaces, numLoops, numPolys, - CD_MASK_DERIVEDMESH); + &CD_MASK_DERIVEDMESH); } void CDDM_apply_vert_coords(DerivedMesh *dm, float (*vertCoords)[3]) diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c index 270849c8ff8..3b83d7308a4 100644 --- a/source/blender/blenkernel/intern/crazyspace.c +++ b/source/blender/blenkernel/intern/crazyspace.c @@ -105,13 +105,13 @@ float (*BKE_crazyspace_get_mapped_editverts( /* disable subsurf temporal, get mapped cos, and enable it */ if (modifiers_disable_subsurf_temporary(obedit)) { /* need to make new derivemesh */ - makeDerivedMesh(depsgraph, scene, obedit, me->edit_mesh, CD_MASK_BAREMESH, false); + makeDerivedMesh(depsgraph, scene, obedit, me->edit_mesh, &CD_MASK_BAREMESH, false); } /* now get the cage */ vertexcos = MEM_mallocN(sizeof(*vertexcos) * nverts, "vertexcos map"); - me_eval = editbmesh_get_eval_cage_from_orig(depsgraph, scene, obedit, me->edit_mesh, CD_MASK_BAREMESH); + me_eval = editbmesh_get_eval_cage_from_orig(depsgraph, scene, obedit, me->edit_mesh, &CD_MASK_BAREMESH); mesh_get_mapped_verts_coords(me_eval, vertexcos, nverts); @@ -273,12 +273,12 @@ int BKE_crazyspace_get_first_deform_matrices_editbmesh( if (mti->type == eModifierTypeType_OnlyDeform && mti->deformMatricesEM) { if (!defmats) { const int required_mode = eModifierMode_Realtime | eModifierMode_Editmode; - CustomDataMask data_mask = CD_MASK_BAREMESH; - CDMaskLink *datamasks = modifiers_calcDataMasks(scene, ob, md, data_mask, required_mode, NULL, 0); + CustomData_MeshMasks data_mask = CD_MASK_BAREMESH; + CDMaskLink *datamasks = modifiers_calcDataMasks(scene, ob, md, &data_mask, required_mode, NULL, NULL); data_mask = datamasks->mask; BLI_linklist_free((LinkNode *)datamasks, NULL); - me = BKE_mesh_from_editmesh_with_coords_thin_wrap(em, data_mask, NULL); + me = BKE_mesh_from_editmesh_with_coords_thin_wrap(em, &data_mask, NULL); deformedVerts = editbmesh_get_vertex_cos(em, &numVerts); defmats = MEM_mallocN(sizeof(*defmats) * numVerts, "defmats"); diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index f4b9040ce85..c3e45480a57 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -62,6 +62,28 @@ BLI_STATIC_ASSERT(ARRAY_SIZE(((CustomData *)NULL)->typemap) == CD_NUMTYPES, "siz static CLG_LogRef LOG = {"bke.customdata"}; + +/** Update mask_dst with layers defined in mask_src (equivalent to a bitwise OR). */ +void CustomData_MeshMasks_update(CustomData_MeshMasks *mask_dst, const CustomData_MeshMasks *mask_src) +{ + mask_dst->vmask |= mask_src->vmask; + mask_dst->emask |= mask_src->emask; + mask_dst->fmask |= mask_src->fmask; + mask_dst->pmask |= mask_src->pmask; + mask_dst->lmask |= mask_src->lmask; +} + +/** Return True if all layers set in \a mask_required are also set in \a mask_ref */ +bool CustomData_MeshMasks_are_matching(const CustomData_MeshMasks *mask_ref, const CustomData_MeshMasks *mask_required) +{ + return (((mask_required->vmask & mask_ref->vmask) == mask_required->vmask) && + ((mask_required->emask & mask_ref->emask) == mask_required->emask) && + ((mask_required->fmask & mask_ref->fmask) == mask_required->fmask) && + ((mask_required->pmask & mask_ref->pmask) == mask_required->pmask) && + ((mask_required->lmask & mask_ref->lmask) == mask_required->lmask)); +} + + /********************* Layer type information **********************/ typedef struct LayerTypeInfo { int size; /* the memory size of one element of this layer's data */ @@ -1370,59 +1392,83 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = { }; -const CustomDataMask CD_MASK_BAREMESH = - CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MLOOP | CD_MASK_MPOLY | CD_MASK_BWEIGHT | CD_MASK_FACEMAP; -const CustomDataMask CD_MASK_MESH = - CD_MASK_MVERT | CD_MASK_MEDGE | - CD_MASK_MDEFORMVERT | - CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_MDISPS | - CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_MPOLY | CD_MASK_MLOOP | - CD_MASK_RECAST | CD_MASK_PAINT_MASK | - CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE | - CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP; -const CustomDataMask CD_MASK_EDITMESH = - CD_MASK_MDEFORMVERT | CD_MASK_MLOOPUV | - CD_MASK_MLOOPCOL | CD_MASK_SHAPE_KEYINDEX | - CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR | - CD_MASK_MDISPS | CD_MASK_SHAPEKEY | CD_MASK_RECAST | CD_MASK_PAINT_MASK | - CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP; -const CustomDataMask CD_MASK_DERIVEDMESH = - CD_MASK_MDEFORMVERT | - CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_CLOTH_ORCO | - CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_PREVIEW_MLOOPCOL | - CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORIGSPACE_MLOOP | CD_MASK_ORCO | CD_MASK_TANGENT | - CD_MASK_PREVIEW_MCOL | CD_MASK_SHAPEKEY | CD_MASK_RECAST | - CD_MASK_ORIGINDEX | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE | - CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP; -const CustomDataMask CD_MASK_BMESH = - CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | - CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | - CD_MASK_PROP_STR | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_MDISPS | - CD_MASK_CREASE | CD_MASK_BWEIGHT | CD_MASK_RECAST | CD_MASK_PAINT_MASK | - CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE | - CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP; +const CustomData_MeshMasks CD_MASK_BAREMESH = { + .vmask = CD_MASK_MVERT | CD_MASK_BWEIGHT, + .emask = CD_MASK_MEDGE | CD_MASK_BWEIGHT, + .fmask = 0, + .lmask = CD_MASK_MLOOP, + .pmask = CD_MASK_MPOLY | CD_MASK_FACEMAP, +}; +const CustomData_MeshMasks CD_MASK_BAREMESH_ORIGINDEX = { + .vmask = CD_MASK_MVERT | CD_MASK_BWEIGHT | CD_MASK_ORIGINDEX, + .emask = CD_MASK_MEDGE | CD_MASK_BWEIGHT | CD_MASK_ORIGINDEX, + .fmask = 0, + .lmask = CD_MASK_MLOOP, + .pmask = CD_MASK_MPOLY | CD_MASK_FACEMAP | CD_MASK_ORIGINDEX, +}; +const CustomData_MeshMasks CD_MASK_MESH = { + .vmask = (CD_MASK_MVERT | CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_PAINT_MASK | + CD_MASK_GENERIC_DATA), + .emask = (CD_MASK_MEDGE | CD_MASK_BWEIGHT | CD_MASK_FREESTYLE_EDGE | CD_MASK_GENERIC_DATA), + .fmask = 0, + .lmask = (CD_MASK_MLOOP | CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL | + CD_MASK_GRID_PAINT_MASK | CD_MASK_GENERIC_DATA), + .pmask = (CD_MASK_MPOLY | CD_MASK_RECAST | CD_MASK_FACEMAP | CD_MASK_FREESTYLE_FACE | CD_MASK_GENERIC_DATA), +}; +const CustomData_MeshMasks CD_MASK_EDITMESH = { + .vmask = (CD_MASK_MDEFORMVERT | CD_MASK_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_SHAPEKEY | + CD_MASK_SHAPE_KEYINDEX | CD_MASK_GENERIC_DATA), + .emask = (CD_MASK_GENERIC_DATA), + .fmask = 0, + .lmask = (CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_GRID_PAINT_MASK | + CD_MASK_GENERIC_DATA), + .pmask = (CD_MASK_MDISPS | CD_MASK_RECAST | CD_MASK_FACEMAP | CD_MASK_GENERIC_DATA), +}; +const CustomData_MeshMasks CD_MASK_DERIVEDMESH = { + .vmask = (CD_MASK_ORIGINDEX | CD_MASK_MDEFORMVERT | CD_MASK_SHAPEKEY | CD_MASK_MVERT_SKIN | + CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | CD_MASK_GENERIC_DATA), + .emask = (CD_MASK_ORIGINDEX | CD_MASK_FREESTYLE_EDGE | CD_MASK_GENERIC_DATA), + .fmask = (CD_MASK_ORIGINDEX | CD_MASK_ORIGSPACE | CD_MASK_PREVIEW_MCOL | CD_MASK_TANGENT), + .lmask = (CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_PREVIEW_MLOOPCOL | + CD_MASK_ORIGSPACE_MLOOP | CD_MASK_TANGENT | CD_MASK_GENERIC_DATA), + .pmask = (CD_MASK_ORIGINDEX | CD_MASK_RECAST | CD_MASK_FREESTYLE_FACE | CD_MASK_FACEMAP | CD_MASK_GENERIC_DATA), +}; +const CustomData_MeshMasks CD_MASK_BMESH = { + .vmask = (CD_MASK_MDEFORMVERT | CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_SHAPEKEY | + CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | CD_MASK_GENERIC_DATA), + .emask = (CD_MASK_BWEIGHT | CD_MASK_CREASE | CD_MASK_FREESTYLE_EDGE | CD_MASK_GENERIC_DATA), + .fmask = 0, + .lmask = (CD_MASK_MDISPS | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL | + CD_MASK_GRID_PAINT_MASK | CD_MASK_GENERIC_DATA), + .pmask = (CD_MASK_RECAST | CD_MASK_FREESTYLE_FACE | CD_MASK_FACEMAP | CD_MASK_GENERIC_DATA), +}; /** * cover values copied by #BKE_mesh_loops_to_tessdata */ -const CustomDataMask CD_MASK_FACECORNERS = - CD_MASK_MTFACE | CD_MASK_MLOOPUV | - CD_MASK_MCOL | CD_MASK_MLOOPCOL | - CD_MASK_PREVIEW_MCOL | CD_MASK_PREVIEW_MLOOPCOL | - CD_MASK_ORIGSPACE | CD_MASK_ORIGSPACE_MLOOP | - CD_MASK_TESSLOOPNORMAL | CD_MASK_NORMAL | - CD_MASK_TANGENT | CD_MASK_MLOOPTANGENT; -const CustomDataMask CD_MASK_EVERYTHING = - CD_MASK_MVERT | CD_MASK_MDEFORMVERT | CD_MASK_MEDGE | CD_MASK_MFACE | - CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_NORMAL /* | CD_MASK_POLYINDEX */ | CD_MASK_PROP_FLT | - CD_MASK_PROP_INT | CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORCO | CD_MASK_MLOOPUV | - CD_MASK_MLOOPCOL | CD_MASK_TANGENT | CD_MASK_MDISPS | CD_MASK_PREVIEW_MCOL | CD_MASK_CLOTH_ORCO | CD_MASK_RECAST | - /* BMESH ONLY START */ - CD_MASK_MPOLY | CD_MASK_MLOOP | CD_MASK_SHAPE_KEYINDEX | CD_MASK_SHAPEKEY | CD_MASK_BWEIGHT | CD_MASK_CREASE | - CD_MASK_ORIGSPACE_MLOOP | CD_MASK_PREVIEW_MLOOPCOL | CD_MASK_BM_ELEM_PYPTR | - /* BMESH ONLY END */ - CD_MASK_PAINT_MASK | CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | - CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE | - CD_MASK_MLOOPTANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP; +const CustomData_MeshMasks CD_MASK_FACECORNERS = { + .vmask = 0, + .emask = 0, + .fmask = (CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_PREVIEW_MCOL | CD_MASK_ORIGSPACE | + CD_MASK_TESSLOOPNORMAL | CD_MASK_TANGENT), + .lmask = (CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL | CD_MASK_PREVIEW_MLOOPCOL | CD_MASK_ORIGSPACE_MLOOP | + CD_MASK_NORMAL | CD_MASK_MLOOPTANGENT), + .pmask = 0, +}; +const CustomData_MeshMasks CD_MASK_EVERYTHING = { + .vmask = (CD_MASK_MVERT | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_NORMAL | CD_MASK_MDEFORMVERT | + CD_MASK_BWEIGHT | CD_MASK_MVERT_SKIN | CD_MASK_ORCO | CD_MASK_CLOTH_ORCO | CD_MASK_SHAPEKEY | + CD_MASK_SHAPE_KEYINDEX | CD_MASK_PAINT_MASK | CD_MASK_GENERIC_DATA), + .emask = (CD_MASK_MEDGE | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_BWEIGHT | CD_MASK_CREASE | + CD_MASK_FREESTYLE_EDGE | CD_MASK_GENERIC_DATA), + .fmask = (CD_MASK_MFACE | CD_MASK_ORIGINDEX | CD_MASK_NORMAL | CD_MASK_MTFACE | CD_MASK_MCOL | + CD_MASK_ORIGSPACE | CD_MASK_TANGENT | CD_MASK_TESSLOOPNORMAL | CD_MASK_PREVIEW_MCOL | + CD_MASK_GENERIC_DATA), + .lmask = (CD_MASK_MLOOP | CD_MASK_BM_ELEM_PYPTR | CD_MASK_MDISPS | CD_MASK_NORMAL | CD_MASK_MLOOPUV | + CD_MASK_MLOOPCOL | CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_MLOOPTANGENT | CD_MASK_PREVIEW_MLOOPCOL | + CD_MASK_ORIGSPACE_MLOOP | CD_MASK_GRID_PAINT_MASK | CD_MASK_GENERIC_DATA), + .pmask = (CD_MASK_MPOLY | CD_MASK_BM_ELEM_PYPTR | CD_MASK_ORIGINDEX | CD_MASK_NORMAL | CD_MASK_RECAST | + CD_MASK_FACEMAP | CD_MASK_FREESTYLE_FACE | CD_MASK_GENERIC_DATA), +}; static const LayerTypeInfo *layerType_getInfo(int type) { @@ -1438,13 +1484,41 @@ static const char *layerType_getName(int type) return LAYERTYPENAMES[type]; } -void customData_mask_layers__print(CustomDataMask mask) +void customData_mask_layers__print(const CustomData_MeshMasks *mask) { int i; - printf("mask=0x%lx:\n", (long unsigned int)mask); + printf("verts mask=0x%lx:\n", (long unsigned int)mask->vmask); + for (i = 0; i < CD_NUMTYPES; i++) { + if (mask->vmask & CD_TYPE_AS_MASK(i)) { + printf(" %s\n", layerType_getName(i)); + } + } + + printf("edges mask=0x%lx:\n", (long unsigned int)mask->emask); + for (i = 0; i < CD_NUMTYPES; i++) { + if (mask->emask & CD_TYPE_AS_MASK(i)) { + printf(" %s\n", layerType_getName(i)); + } + } + + printf("faces mask=0x%lx:\n", (long unsigned int)mask->fmask); + for (i = 0; i < CD_NUMTYPES; i++) { + if (mask->fmask & CD_TYPE_AS_MASK(i)) { + printf(" %s\n", layerType_getName(i)); + } + } + + printf("loops mask=0x%lx:\n", (long unsigned int)mask->lmask); + for (i = 0; i < CD_NUMTYPES; i++) { + if (mask->lmask & CD_TYPE_AS_MASK(i)) { + printf(" %s\n", layerType_getName(i)); + } + } + + printf("polys mask=0x%lx:\n", (long unsigned int)mask->pmask); for (i = 0; i < CD_NUMTYPES; i++) { - if (mask & CD_TYPE_AS_MASK(i)) { + if (mask->pmask & CD_TYPE_AS_MASK(i)) { printf(" %s\n", layerType_getName(i)); } } diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c index 2f011d6a919..4c4d57ddbac 100644 --- a/source/blender/blenkernel/intern/data_transfer.c +++ b/source/blender/blenkernel/intern/data_transfer.c @@ -51,12 +51,9 @@ static CLG_LogRef LOG = {"bke.data_transfer"}; -CustomDataMask BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types) +void BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types, CustomData_MeshMasks *r_data_masks) { - CustomDataMask cddata_mask = 0; - int i; - - for (i = 0; i < DT_TYPE_MAX; i++) { + for (int i = 0; i < DT_TYPE_MAX; i++) { const int dtdata_type = 1 << i; int cddata_type; @@ -66,20 +63,30 @@ CustomDataMask BKE_object_data_transfer_dttypes_to_cdmask(const int dtdata_types cddata_type = BKE_object_data_transfer_dttype_to_cdtype(dtdata_type); if (!(cddata_type & CD_FAKE)) { - cddata_mask |= 1LL << cddata_type; + if (DT_DATATYPE_IS_VERT(dtdata_type)) { + r_data_masks->vmask |= 1LL << cddata_type; + } + else if (DT_DATATYPE_IS_EDGE(dtdata_type)) { + r_data_masks->emask |= 1LL << cddata_type; + } + else if (DT_DATATYPE_IS_LOOP(dtdata_type)) { + r_data_masks->lmask |= 1LL << cddata_type; + } + else if (DT_DATATYPE_IS_POLY(dtdata_type)) { + r_data_masks->pmask |= 1LL << cddata_type; + } } else if (cddata_type == CD_FAKE_MDEFORMVERT) { - cddata_mask |= CD_MASK_MDEFORMVERT; /* Exception for vgroups :/ */ + r_data_masks->vmask |= CD_MASK_MDEFORMVERT; /* Exception for vgroups :/ */ } else if (cddata_type == CD_FAKE_UV) { - cddata_mask |= CD_MASK_MLOOPUV; + r_data_masks->lmask |= CD_MASK_MLOOPUV; } else if (cddata_type == CD_FAKE_LNOR) { - cddata_mask |= CD_MASK_NORMAL | CD_MASK_CUSTOMLOOPNORMAL; + r_data_masks->vmask |= CD_MASK_NORMAL; + r_data_masks->lmask |= CD_MASK_NORMAL | CD_MASK_CUSTOMLOOPNORMAL; } } - - return cddata_mask; } /* Check what can do each layer type (if it is actually handled by transferdata, if it supports advanced mixing... */ @@ -992,15 +999,15 @@ void BKE_object_data_transfer_layout( const bool use_create = true; /* We always create needed layers here. */ - CustomDataMask me_src_mask = CD_MASK_BAREMESH; + CustomData_MeshMasks me_src_mask = CD_MASK_BAREMESH; BLI_assert((ob_src != ob_dst) && (ob_src->type == OB_MESH) && (ob_dst->type == OB_MESH)); me_dst = ob_dst->data; /* Get source evaluated mesh.*/ - me_src_mask |= BKE_object_data_transfer_dttypes_to_cdmask(data_types); - me_src = mesh_get_eval_final(depsgraph, scene, ob_src, me_src_mask); + BKE_object_data_transfer_dttypes_to_cdmask(data_types, &me_src_mask); + me_src = mesh_get_eval_final(depsgraph, scene, ob_src, &me_src_mask); if (!me_src) { return; } @@ -1090,7 +1097,7 @@ bool BKE_object_data_transfer_ex( const bool use_delete = false; /* We never delete data layers from destination here. */ - CustomDataMask me_src_mask = CD_MASK_BAREMESH; + CustomData_MeshMasks me_src_mask = CD_MASK_BAREMESH; BLI_assert((ob_src != ob_dst) && (ob_src->type == OB_MESH) && (ob_dst->type == OB_MESH)); @@ -1113,17 +1120,17 @@ bool BKE_object_data_transfer_ex( } /* Get source evaluated mesh.*/ - me_src_mask |= BKE_object_data_transfer_dttypes_to_cdmask(data_types); + BKE_object_data_transfer_dttypes_to_cdmask(data_types, &me_src_mask); if (is_modifier) { me_src = BKE_modifier_get_evaluated_mesh_from_evaluated_object(ob_src, false); - if (me_src == NULL || (me_src_mask & ~ob_src->runtime.last_data_mask) != 0) { + if (me_src == NULL || !CustomData_MeshMasks_are_matching(&ob_src->runtime.last_data_mask, &me_src_mask)) { CLOG_WARN(&LOG, "Data Transfer: source mesh data is not ready - dependency cycle?"); return changed; } } else { - me_src = mesh_get_eval_final(depsgraph, scene, ob_src, me_src_mask); + me_src = mesh_get_eval_final(depsgraph, scene, ob_src, &me_src_mask); } if (!me_src) { return changed; diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index ddb4b9eb211..c46691901f0 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -526,7 +526,7 @@ float (*BKE_editmesh_vertexCos_get(struct Depsgraph *depsgraph, BMEditMesh *em, struct CageUserData data; float (*cos_cage)[3]; - cage = editbmesh_get_eval_cage(depsgraph, scene, em->ob, em, CD_MASK_BAREMESH); + cage = editbmesh_get_eval_cage(depsgraph, scene, em->ob, em, &CD_MASK_BAREMESH); cos_cage = MEM_callocN(sizeof(*cos_cage) * em->bm->totvert, "bmbvh cos_cage"); /* when initializing cage verts, we only want the first cage coordinate for each vertex, diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 70f021c57f4..2263c5f1a05 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -54,7 +54,7 @@ void initElbeemMesh(struct Depsgraph *depsgraph, struct Scene *scene, struct Obj float *verts; int *tris; - mesh = mesh_create_eval_final_index_render(depsgraph, scene, ob, CD_MASK_BAREMESH, modifierIndex); + mesh = mesh_create_eval_final_index_render(depsgraph, scene, ob, &CD_MASK_BAREMESH, modifierIndex); mvert = mesh->mvert; mloop = mesh->mloop; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index a05ba2bb35f..592f3a26a12 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -535,22 +535,22 @@ void BKE_mesh_copy_data(Main *bmain, Mesh *me_dst, const Mesh *me_src, const int me_dst->runtime.is_original = false; const bool do_tessface = ((me_src->totface != 0) && (me_src->totpoly == 0)); /* only do tessface if we have no polys */ - CustomDataMask mask = CD_MASK_MESH; + CustomData_MeshMasks mask = CD_MASK_MESH; if (me_src->id.tag & LIB_TAG_NO_MAIN) { /* For copies in depsgraph, keep data like origindex and orco. */ - mask |= CD_MASK_DERIVEDMESH; + CustomData_MeshMasks_update(&mask, &CD_MASK_DERIVEDMESH); } me_dst->mat = MEM_dupallocN(me_src->mat); const eCDAllocType alloc_type = (flag & LIB_ID_COPY_CD_REFERENCE) ? CD_REFERENCE : CD_DUPLICATE; - CustomData_copy(&me_src->vdata, &me_dst->vdata, mask, alloc_type, me_dst->totvert); - CustomData_copy(&me_src->edata, &me_dst->edata, mask, alloc_type, me_dst->totedge); - CustomData_copy(&me_src->ldata, &me_dst->ldata, mask, alloc_type, me_dst->totloop); - CustomData_copy(&me_src->pdata, &me_dst->pdata, mask, alloc_type, me_dst->totpoly); + CustomData_copy(&me_src->vdata, &me_dst->vdata, mask.vmask, alloc_type, me_dst->totvert); + CustomData_copy(&me_src->edata, &me_dst->edata, mask.emask, alloc_type, me_dst->totedge); + CustomData_copy(&me_src->ldata, &me_dst->ldata, mask.lmask, alloc_type, me_dst->totloop); + CustomData_copy(&me_src->pdata, &me_dst->pdata, mask.pmask, alloc_type, me_dst->totpoly); if (do_tessface) { - CustomData_copy(&me_src->fdata, &me_dst->fdata, mask, alloc_type, me_dst->totface); + CustomData_copy(&me_src->fdata, &me_dst->fdata, mask.fmask, alloc_type, me_dst->totface); } else { mesh_tessface_clear_intern(me_dst, false); @@ -629,7 +629,7 @@ static Mesh *mesh_new_nomain_from_template_ex( const Mesh *me_src, int verts_len, int edges_len, int tessface_len, int loops_len, int polys_len, - CustomDataMask mask) + CustomData_MeshMasks mask) { /* Only do tessface if we are creating tessfaces or copying from mesh with only tessfaces. */ const bool do_tessface = (tessface_len || @@ -648,12 +648,12 @@ static Mesh *mesh_new_nomain_from_template_ex( me_dst->cd_flag = me_src->cd_flag; - CustomData_copy(&me_src->vdata, &me_dst->vdata, mask, CD_CALLOC, verts_len); - CustomData_copy(&me_src->edata, &me_dst->edata, mask, CD_CALLOC, edges_len); - CustomData_copy(&me_src->ldata, &me_dst->ldata, mask, CD_CALLOC, loops_len); - CustomData_copy(&me_src->pdata, &me_dst->pdata, mask, CD_CALLOC, polys_len); + CustomData_copy(&me_src->vdata, &me_dst->vdata, mask.vmask, CD_CALLOC, verts_len); + CustomData_copy(&me_src->edata, &me_dst->edata, mask.emask, CD_CALLOC, edges_len); + CustomData_copy(&me_src->ldata, &me_dst->ldata, mask.lmask, CD_CALLOC, loops_len); + CustomData_copy(&me_src->pdata, &me_dst->pdata, mask.pmask, CD_CALLOC, polys_len); if (do_tessface) { - CustomData_copy(&me_src->fdata, &me_dst->fdata, mask, CD_CALLOC, tessface_len); + CustomData_copy(&me_src->fdata, &me_dst->fdata, mask.fmask, CD_CALLOC, tessface_len); } else { mesh_tessface_clear_intern(me_dst, false); @@ -736,7 +736,7 @@ Mesh *BKE_mesh_from_bmesh_nomain(BMesh *bm, const struct BMeshToMeshParams *para return mesh; } -Mesh *BKE_mesh_from_bmesh_for_eval_nomain(BMesh *bm, const int64_t cd_mask_extra) +Mesh *BKE_mesh_from_bmesh_for_eval_nomain(BMesh *bm, const CustomData_MeshMasks *cd_mask_extra) { Mesh *mesh = BKE_id_new_nomain(ID_ME, NULL); BM_mesh_bm_to_me_for_eval(bm, mesh, cd_mask_extra); @@ -747,7 +747,7 @@ Mesh *BKE_mesh_from_bmesh_for_eval_nomain(BMesh *bm, const int64_t cd_mask_extra * TODO(campbell): support mesh with only an edit-mesh which is lazy initialized. */ Mesh *BKE_mesh_from_editmesh_with_coords_thin_wrap( - BMEditMesh *em, CustomDataMask data_mask, float (*vertexCos)[3]) + BMEditMesh *em, const CustomData_MeshMasks *data_mask, float (*vertexCos)[3]) { Mesh *me = BKE_mesh_from_bmesh_for_eval_nomain(em->bm, data_mask); /* Use editmesh directly where possible. */ diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 5831471eb05..ad60cb9c49d 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -592,7 +592,7 @@ void BKE_mesh_from_nurbs_displist( else { me = BKE_mesh_add(bmain, obdata_name); ob->runtime.mesh_eval = NULL; - BKE_mesh_nomain_to_mesh(me_eval, me, ob, CD_MASK_MESH, false); + BKE_mesh_nomain_to_mesh(me_eval, me, ob, &CD_MASK_MESH, false); } me->totcol = cu->totcol; @@ -817,7 +817,7 @@ void BKE_mesh_to_curve(Main *bmain, Depsgraph *depsgraph, Scene *UNUSED(scene), /* make new mesh data from the original copy */ Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); - Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, CD_MASK_MESH); + Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, &CD_MASK_MESH); ListBase nurblist = {NULL, NULL}; BKE_mesh_to_curve_nurblist(me_eval, &nurblist, 0); @@ -981,22 +981,22 @@ Mesh *BKE_mesh_new_from_object( else { /* Make a dummy mesh, saves copying */ Mesh *me_eval; - /* CustomDataMask mask = CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL; */ - CustomDataMask mask = CD_MASK_MESH; /* this seems more suitable, exporter, - * for example, needs CD_MASK_MDEFORMVERT */ + CustomData_MeshMasks mask = CD_MASK_MESH; /* this seems more suitable, exporter, + * for example, needs CD_MASK_MDEFORMVERT */ - if (calc_undeformed) - mask |= CD_MASK_ORCO; + if (calc_undeformed) { + mask.vmask |= CD_MASK_ORCO; + } if (render) { - me_eval = mesh_create_eval_final_render(depsgraph, sce, ob, mask); + me_eval = mesh_create_eval_final_render(depsgraph, sce, ob, &mask); } else { - me_eval = mesh_create_eval_final_view(depsgraph, sce, ob, mask); + me_eval = mesh_create_eval_final_view(depsgraph, sce, ob, &mask); } tmpmesh = BKE_mesh_add(bmain, ((ID *)ob->data)->name + 2); - BKE_mesh_nomain_to_mesh(me_eval, tmpmesh, ob, mask, true); + BKE_mesh_nomain_to_mesh(me_eval, tmpmesh, ob, &mask, true); /* Copy autosmooth settings from original mesh. */ Mesh *me = (Mesh *)ob->data; @@ -1228,7 +1228,8 @@ static void shapekey_layers_to_keyblocks(Mesh *mesh_src, Mesh *mesh_dst, int act /* This is a Mesh-based copy of DM_to_mesh() */ -void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomDataMask mask, bool take_ownership) +void BKE_mesh_nomain_to_mesh( + Mesh *mesh_src, Mesh *mesh_dst, Object *ob, const CustomData_MeshMasks *mask, bool take_ownership) { /* mesh_src might depend on mesh_dst, so we need to do everything with a local copy */ /* TODO(Sybren): the above claim came from DM_to_mesh(); check whether it is still true with Mesh */ @@ -1262,10 +1263,10 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomD totpoly = tmp.totpoly = mesh_src->totpoly; tmp.totface = 0; - CustomData_copy(&mesh_src->vdata, &tmp.vdata, mask, alloctype, totvert); - CustomData_copy(&mesh_src->edata, &tmp.edata, mask, alloctype, totedge); - CustomData_copy(&mesh_src->ldata, &tmp.ldata, mask, alloctype, totloop); - CustomData_copy(&mesh_src->pdata, &tmp.pdata, mask, alloctype, totpoly); + CustomData_copy(&mesh_src->vdata, &tmp.vdata, mask->vmask, alloctype, totvert); + CustomData_copy(&mesh_src->edata, &tmp.edata, mask->emask, alloctype, totedge); + CustomData_copy(&mesh_src->ldata, &tmp.ldata, mask->lmask, alloctype, totloop); + CustomData_copy(&mesh_src->pdata, &tmp.pdata, mask->pmask, alloctype, totpoly); tmp.cd_flag = mesh_src->cd_flag; tmp.runtime.deformed_only = mesh_src->runtime.deformed_only; @@ -1370,10 +1371,10 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomD if (take_ownership) { if (alloctype == CD_ASSIGN) { - CustomData_free_typemask(&mesh_src->vdata, mesh_src->totvert, ~mask); - CustomData_free_typemask(&mesh_src->edata, mesh_src->totedge, ~mask); - CustomData_free_typemask(&mesh_src->ldata, mesh_src->totloop, ~mask); - CustomData_free_typemask(&mesh_src->pdata, mesh_src->totpoly, ~mask); + CustomData_free_typemask(&mesh_src->vdata, mesh_src->totvert, ~mask->vmask); + CustomData_free_typemask(&mesh_src->edata, mesh_src->totedge, ~mask->emask); + CustomData_free_typemask(&mesh_src->ldata, mesh_src->totloop, ~mask->lmask); + CustomData_free_typemask(&mesh_src->pdata, mesh_src->totpoly, ~mask->pmask); } BKE_id_free(NULL, mesh_src); } diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 29879be3d45..a5aa198bc4e 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -40,6 +40,7 @@ #include "BLI_math_base.h" #include "BLI_math_vector.h" +#include "BKE_customdata.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -888,12 +889,15 @@ bool BKE_mesh_validate_all_customdata( bool is_valid = true; bool is_change_v, is_change_e, is_change_l, is_change_p; int tot_uvloop, tot_vcolloop; - CustomDataMask mask = check_meshmask ? CD_MASK_MESH : 0; + CustomData_MeshMasks mask = {0}; + if (check_meshmask) { + mask = CD_MASK_MESH; + } - is_valid &= mesh_validate_customdata(vdata, mask, totvert, do_verbose, do_fixes, &is_change_v); - is_valid &= mesh_validate_customdata(edata, mask, totedge, do_verbose, do_fixes, &is_change_e); - is_valid &= mesh_validate_customdata(ldata, mask, totloop, do_verbose, do_fixes, &is_change_l); - is_valid &= mesh_validate_customdata(pdata, mask, totpoly, do_verbose, do_fixes, &is_change_p); + is_valid &= mesh_validate_customdata(vdata, mask.vmask, totvert, do_verbose, do_fixes, &is_change_v); + is_valid &= mesh_validate_customdata(edata, mask.emask, totedge, do_verbose, do_fixes, &is_change_e); + is_valid &= mesh_validate_customdata(ldata, mask.lmask, totloop, do_verbose, do_fixes, &is_change_l); + is_valid &= mesh_validate_customdata(pdata, mask.pmask, totpoly, do_verbose, do_fixes, &is_change_p); tot_uvloop = CustomData_number_of_layers(ldata, CD_MLOOPUV); tot_vcolloop = CustomData_number_of_layers(ldata, CD_MLOOPCOL); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index ab5e2eaf491..189bd8623c4 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -478,8 +478,8 @@ bool modifier_isEnabled(const struct Scene *scene, ModifierData *md, int require } CDMaskLink *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierData *md, - CustomDataMask dataMask, int required_mode, - ModifierData *previewmd, CustomDataMask previewmask) + const CustomData_MeshMasks *dataMask, int required_mode, + ModifierData *previewmd, const CustomData_MeshMasks *previewmask) { CDMaskLink *dataMasks = NULL; CDMaskLink *curr, *prev; @@ -492,10 +492,10 @@ CDMaskLink *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierDat if (modifier_isEnabled(scene, md, required_mode)) { if (mti->requiredDataMask) - curr->mask = mti->requiredDataMask(ob, md); + mti->requiredDataMask(ob, md, &curr->mask); - if (previewmd == md) { - curr->mask |= previewmask; + if (previewmd == md && previewmask != NULL) { + CustomData_MeshMasks_update(&curr->mask, previewmask); } } @@ -512,15 +512,10 @@ CDMaskLink *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierDat */ for (curr = dataMasks, prev = NULL; curr; prev = curr, curr = curr->next) { if (prev) { - CustomDataMask prev_mask = prev->mask; - CustomDataMask curr_mask = curr->mask; - - curr->mask = curr_mask | prev_mask; + CustomData_MeshMasks_update(&curr->mask, &prev->mask); } else { - CustomDataMask curr_mask = curr->mask; - - curr->mask = curr_mask | dataMask; + CustomData_MeshMasks_update(&curr->mask, dataMask); } } @@ -877,13 +872,13 @@ struct DerivedMesh *modifier_applyModifier_DM_deprecated( Mesh *mesh = NULL; if (dm != NULL) { mesh = BKE_id_new_nomain(ID_ME, NULL); - DM_to_mesh(dm, mesh, ctx->object, CD_MASK_EVERYTHING, false); + DM_to_mesh(dm, mesh, ctx->object, &CD_MASK_EVERYTHING, false); } struct Mesh *new_mesh = mti->applyModifier(md, ctx, mesh); /* Make a DM that doesn't reference new_mesh so we can free the latter. */ - DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE, CD_MASK_EVERYTHING); + DerivedMesh *ndm = CDDM_from_mesh_ex(new_mesh, CD_DUPLICATE, &CD_MASK_EVERYTHING); if (new_mesh != mesh) { BKE_id_free(NULL, new_mesh); diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 422ce5ae19b..774fde0af7d 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -280,7 +280,7 @@ Mesh *BKE_multires_create_mesh( Object *ob) { Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); - Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene, ob_eval, CD_MASK_BAREMESH); + Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene, ob_eval, &CD_MASK_BAREMESH); ModifierEvalContext modifier_ctx = { .depsgraph = depsgraph, .object = ob_eval, @@ -759,7 +759,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object /* generate highest level with displacements */ cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); dispdm = multires_dm_create_local(scene, ob, cddm, totlvl, totlvl, 0, 0, MULTIRES_IGNORE_SIMPLIFY); cddm->release(cddm); @@ -855,7 +855,7 @@ void multiresModifier_base_apply(MultiresModifierData *mmd, Scene *scene, Object /* subdivide the mesh to highest level without displacements */ cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); origdm = subsurf_dm_create_local( scene, ob, cddm, totlvl, 0, 0, mmd->uv_smooth == SUBSURF_UV_SMOOTH_NONE, 0, false, SUBSURF_IGNORE_SIMPLIFY); @@ -898,7 +898,7 @@ static void multires_subdivide( /* create subsurf DM from original mesh at high level */ cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); highdm = subsurf_dm_create_local( NULL, ob, cddm, totlvl, simple, 0, mmd->uv_smooth == SUBSURF_UV_SMOOTH_NONE, has_mask, false, SUBSURF_IGNORE_SIMPLIFY); @@ -1220,7 +1220,7 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene) /* create subsurf DM from original mesh at high level */ if (ob->derivedDeform) cddm = CDDM_copy(ob->derivedDeform); else cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); highdm = subsurf_dm_create_local( scene, ob, cddm, totlvl, mmd->simple, 0, mmd->uv_smooth == SUBSURF_UV_SMOOTH_NONE, @@ -1284,7 +1284,7 @@ void multires_modifier_update_mdisps(struct DerivedMesh *dm, Scene *scene) if (ob->derivedDeform) cddm = CDDM_copy(ob->derivedDeform); else cddm = CDDM_from_mesh(me); - DM_set_only_copy(cddm, CD_MASK_BAREMESH); + DM_set_only_copy(cddm, &CD_MASK_BAREMESH); subdm = subsurf_dm_create_local( scene, ob, cddm, mmd->totlvl, mmd->simple, 0, mmd->uv_smooth == SUBSURF_UV_SMOOTH_NONE, diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index a1253d65294..019757cc75a 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -861,7 +861,7 @@ static Subdiv *multires_create_subdiv_for_reshape( Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Object *object_eval = DEG_get_evaluated_object(depsgraph, object); Mesh *deformed_mesh = mesh_get_eval_deform( - depsgraph, scene_eval, object_eval, CD_MASK_BAREMESH); + depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); SubdivSettings subdiv_settings; BKE_multires_subdiv_settings_init(&subdiv_settings, mmd); Subdiv *subdiv = BKE_subdiv_new_from_mesh(&subdiv_settings, deformed_mesh); @@ -965,7 +965,7 @@ bool multiresModifier_reshapeFromObject( Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Object *src_eval = DEG_get_evaluated_object(depsgraph, src); Mesh *src_mesh_eval = mesh_get_eval_final( - depsgraph, scene_eval, src_eval, CD_MASK_BAREMESH); + depsgraph, scene_eval, src_eval, &CD_MASK_BAREMESH); int num_deformed_verts; float (*deformed_verts)[3] = BKE_mesh_vertexCos_get( src_mesh_eval, &num_deformed_verts); diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 60cf4d1b1d4..304c9985f10 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -168,18 +168,20 @@ void BKE_object_handle_data_update( } #endif - uint64_t data_mask = scene->customdata_mask | CD_MASK_BAREMESH; + CustomData_MeshMasks cddata_masks = scene->customdata_mask; + CustomData_MeshMasks_update(&cddata_masks, &CD_MASK_BAREMESH); #ifdef WITH_FREESTYLE /* make sure Freestyle edge/face marks appear in DM for render (see T40315) */ if (DEG_get_mode(depsgraph) != DAG_EVAL_VIEWPORT) { - data_mask |= CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE; + cddata_masks.emask |= CD_MASK_FREESTYLE_EDGE; + cddata_masks.pmask |= CD_MASK_FREESTYLE_FACE; } #endif if (em) { - makeDerivedMesh(depsgraph, scene, ob, em, data_mask, false); /* was CD_MASK_BAREMESH */ + makeDerivedMesh(depsgraph, scene, ob, em, &cddata_masks, false); /* was CD_MASK_BAREMESH */ } else { - makeDerivedMesh(depsgraph, scene, ob, NULL, data_mask, false); + makeDerivedMesh(depsgraph, scene, ob, NULL, &cddata_masks, false); } break; } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 2977a8bed16..b3999e61216 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -1100,7 +1100,7 @@ void BKE_sculpt_update_mesh_elements( ss->kb = (mmd == NULL) ? BKE_keyblock_from_object(ob) : NULL; - Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, ob_eval, CD_MASK_BAREMESH); + Mesh *me_eval = mesh_get_eval_final(depsgraph, scene, ob_eval, &CD_MASK_BAREMESH); /* VWPaint require mesh info for loop lookup, so require sculpt mode here */ if (mmd && ob->mode & OB_MODE_SCULPT) { @@ -1397,7 +1397,7 @@ PBVH *BKE_sculpt_object_pbvh_ensure(Depsgraph *depsgraph, Object *ob) } else if (ob->type == OB_MESH) { Mesh *me_eval_deform = mesh_get_eval_deform( - depsgraph, DEG_get_evaluated_scene(depsgraph), object_eval, CD_MASK_BAREMESH); + depsgraph, DEG_get_evaluated_scene(depsgraph), object_eval, &CD_MASK_BAREMESH); pbvh = build_pbvh_from_regular_mesh(ob, me_eval_deform); } } diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 3146e3f9fd2..da2975d8efc 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1625,39 +1625,40 @@ static void psys_particle_on_shape(int UNUSED(distr), int UNUSED(index), /* Particles on emitter */ /************************************************/ -CustomDataMask psys_emitter_customdata_mask(ParticleSystem *psys) +void psys_emitter_customdata_mask(ParticleSystem *psys, CustomData_MeshMasks *r_cddata_masks) { - CustomDataMask dataMask = 0; MTex *mtex; int i; if (!psys->part) - return 0; + return; for (i = 0; i < MAX_MTEX; i++) { mtex = psys->part->mtex[i]; if (mtex && mtex->mapto && (mtex->texco & TEXCO_UV)) - dataMask |= CD_MASK_MTFACE; + r_cddata_masks->fmask |= CD_MASK_MTFACE; } if (psys->part->tanfac != 0.0f) - dataMask |= CD_MASK_MTFACE; + r_cddata_masks->fmask |= CD_MASK_MTFACE; /* ask for vertexgroups if we need them */ for (i = 0; i < PSYS_TOT_VG; i++) { if (psys->vgroup[i]) { - dataMask |= CD_MASK_MDEFORMVERT; + r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; break; } } /* particles only need this if they are after a non deform modifier, and * the modifier stack will only create them in that case. */ - dataMask |= CD_MASK_ORIGSPACE_MLOOP | CD_MASK_ORIGINDEX; - - dataMask |= CD_MASK_ORCO; + r_cddata_masks->lmask |= CD_MASK_ORIGSPACE_MLOOP; + /* XXX Check we do need all those? */ + r_cddata_masks->vmask |= CD_MASK_ORIGINDEX; + r_cddata_masks->emask |= CD_MASK_ORIGINDEX; + r_cddata_masks->pmask |= CD_MASK_ORIGINDEX; - return dataMask; + r_cddata_masks->vmask |= CD_MASK_ORCO; } void psys_particle_on_emitter(ParticleSystemModifierData *psmd, int from, int index, int index_dmcache, diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 6947270d88e..7dc772576c5 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -18,16 +18,17 @@ * \ingroup bli */ -#include "DNA_meshdata_types.h" - #include "MEM_guardedalloc.h" +#include "BLI_utildefines.h" + #include "BLI_bitmap.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_task.h" +#include "DNA_meshdata_types.h" + #include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_subsurf.h" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index 26312be9d69..bb01bfd587a 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -32,6 +32,7 @@ #include "BLI_bitmap.h" #include "BLI_task.h" +#include "BKE_customdata.h" #include "BKE_mesh.h" #include "BKE_key.h" #include "BKE_subdiv.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index 709f3fef4fc..8ac120ec79d 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -32,6 +32,7 @@ #include "BLI_alloca.h" #include "BLI_math_vector.h" +#include "BKE_customdata.h" #include "BKE_mesh.h" #include "BKE_key.h" #include "BKE_subdiv.h" @@ -224,7 +225,7 @@ static void vertex_interpolation_init( /* Allocate storage for loops corresponding to ptex corners. */ CustomData_copy(&ctx->coarse_mesh->vdata, &vertex_interpolation->vertex_data_storage, - CD_MASK_EVERYTHING, + CD_MASK_EVERYTHING.vmask, CD_CALLOC, 4); /* Initialize indices. */ @@ -355,7 +356,7 @@ static void loop_interpolation_init( /* Allocate storage for loops corresponding to ptex corners. */ CustomData_copy(&ctx->coarse_mesh->ldata, &loop_interpolation->loop_data_storage, - CD_MASK_EVERYTHING, + CD_MASK_EVERYTHING.lmask, CD_CALLOC, 4); /* Initialize indices. */ |