[Bf-blender-cvs] [2d2bfd4] master: Fix T43122: Shrinkwrap target, wrong linked object

[Campbell Barton]

Commit: 2d2bfd416b55233da9b8c38234ea1062bf3f9368
Author: Campbell Barton
Date:   Tue Jan 6 14:01:18 2015 +1100
Branches: master
https://developer.blender.org/rB2d2bfd416b55233da9b8c38234ea1062bf3f9368

Fix T43122: Shrinkwrap target, wrong linked object

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index e8000a0..268c911 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;
 	}