diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-06 06:01:18 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-01-06 12:33:39 +0300 |
| commit | 0b5a64fe7f4b0e4286d7aafaa85501bf60d8576b (patch) | |
| tree | f978a799e81607a92a555adfb51f8ad0c4901bfa | |
| parent | f322362363066cd8863938fda33d0667570bb97a (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; } |