diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/modifiers/intern/MOD_datatransfer.c | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/modifiers/intern/MOD_datatransfer.c')
| -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 9fd23598cb6..e7069937868 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -152,7 +152,7 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) DT_TYPE_SHARP_FACE \ ) -static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData, +static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob, DerivedMesh *derivedData, ModifierApplyFlag UNUSED(flag)) { DataTransferModifierData *dtmd = (DataTransferModifierData *) md; @@ -184,7 +184,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der BKE_reports_init(&reports, RPT_STORE); /* Note: no islands precision for now here. */ - BKE_object_data_transfer_dm(md->scene, dtmd->ob_source, ob, dm, dtmd->data_types, false, + BKE_object_data_transfer_dm(eval_ctx, md->scene, dtmd->ob_source, ob, dm, dtmd->data_types, false, dtmd->vmap_mode, dtmd->emap_mode, dtmd->lmap_mode, dtmd->pmap_mode, space_transform, false, max_dist, dtmd->map_ray_radius, 0.0f, dtmd->layers_select_src, dtmd->layers_select_dst, |