diff options
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -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; } |