diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-14 11:46:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-03-14 11:48:35 +0300 |
| commit | bcc66136c2745b9d047fc5540c7b6b247855955f (patch) | |
| tree | 37708345e6a87de14d43f03ba1c5a99dacc32ba8 /source/blender/modifiers | |
| parent | 687e4b42d503de8cca77d74cc3449911fbd37bf6 (diff) | |
Fix T62528: data transfer modifier error.
Stupid mistake in previous 'fixing' commit, I put the call computing
extra required source cddata masks into the callback used to get
destination (current object) cddata masks...
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_datatransfer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 1371dd947bb..3db33ca07c2 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -85,8 +85,6 @@ static void requiredDataMask(Object *UNUSED(ob), ModifierData *md, CustomData_Me } BKE_object_data_transfer_dttypes_to_cdmask(dtmd->data_types, r_cddata_masks); - BKE_mesh_remap_calc_source_cddata_masks_from_map_modes( - dtmd->vmap_mode, dtmd->emap_mode, dtmd->lmap_mode, dtmd->pmap_mode, r_cddata_masks); } static bool dependsOnNormals(ModifierData *md) @@ -124,6 +122,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte if (dtmd->ob_source != NULL) { CustomData_MeshMasks cddata_masks = {0}; BKE_object_data_transfer_dttypes_to_cdmask(dtmd->data_types, &cddata_masks); + BKE_mesh_remap_calc_source_cddata_masks_from_map_modes( + dtmd->vmap_mode, dtmd->emap_mode, dtmd->lmap_mode, dtmd->pmap_mode, &cddata_masks); DEG_add_object_relation(ctx->node, dtmd->ob_source, DEG_OB_COMP_GEOMETRY, "DataTransfer Modifier"); DEG_add_customdata_mask(ctx->node, dtmd->ob_source, &cddata_masks); |