Commit: 0b5a64fe7f4b0e4286d7aafaa85501bf60d8576b
Author: Campbell Barton
Date: Tue Jan 6 14:01:18 2015 +1100
Branches: blender-v2.73-release
https://developer.blender.org/rB0b5a64fe7f4b0e4286d7aafaa85501bf60d8576b
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
