diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-06 06:01:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-06 06:01:18 +0300 |
| commit | 2d2bfd416b55233da9b8c38234ea1062bf3f9368 (patch) | |
| tree | 0200dd198847bf3b81a4104fe1dff4ec83dd53a1 | |
| parent | 62f2b751f8c2c94bd783ce3d9bef6fc5c7d783c7 (diff) | |
Fix T43122: Shrinkwrap target, wrong linked object
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index e8000a09d82..268c911fc54 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2509,7 +2509,9 @@ DerivedMesh *object_get_derived_final(Object *ob, const bool for_render) return ob->derivedFinal; } - if (em) { + /* only return the editmesh if its from this object because + * we don't a mesh from another object's modifier stack: T43122 */ + if (em && (em->ob == ob)) { DerivedMesh *dm = em->derivedFinal; return dm; } |