archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T62528: data transfer modifier error.

Browse Source 
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...
This commit is contained in:
Bastien Montagne
2019-03-14 09:46:46 +01:00
parent 687e4b42d5
commit bcc66136c2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_datatransfer.c
View File

@@ -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_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) static bool dependsOnNormals(ModifierData *md)
@@ -124,6 +122,8 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
if (dtmd->ob_source != NULL) { if (dtmd->ob_source != NULL) {
CustomData_MeshMasks cddata_masks = {0}; CustomData_MeshMasks cddata_masks = {0};
BKE_object_data_transfer_dttypes_to_cdmask(dtmd->data_types, &cddata_masks); 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_object_relation(ctx->node, dtmd->ob_source, DEG_OB_COMP_GEOMETRY, "DataTransfer Modifier");
DEG_add_customdata_mask(ctx->node, dtmd->ob_source, &cddata_masks); DEG_add_customdata_mask(ctx->node, dtmd->ob_source, &cddata_masks);