diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-18 10:29:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-18 10:33:01 +0300 |
| commit | 2fbc50e4c1714d393453209ff6c305c01bb3421f (patch) | |
| tree | f83ee962de5f4b4f9e09eb66a08b05852a7f60c5 /source/blender/blenkernel/intern/shrinkwrap.c | |
| parent | 3ceb68c8338e1c23f7e625aee393a71b54a242ce (diff) | |
Alternate fix for T50899
object_get_derived_final shouldn't have been assuming mesh objects.
It's even valid to use a curve as a target for a shrink-wrap modifier.
Diffstat (limited to 'source/blender/blenkernel/intern/shrinkwrap.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index b14ed2d67ad..7094d5a3547 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -588,13 +588,8 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM DerivedMesh *ss_mesh = NULL; ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData; - /* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) - * This also ensure the target is of type OBJ_MESH avoiding crash in `object_get_derived_final` (see T50899). */ - if (smd->target) { - if (smd->target->type != OB_MESH || smd->target == ob) { - smd->target = NULL; - } - } + /* remove loop dependencies on derived meshes (TODO should this be done elsewhere?) */ + if (smd->target == ob) smd->target = NULL; if (smd->auxTarget == ob) smd->auxTarget = NULL; |