[Bf-blender-cvs] [c86606e] gooseberry: Fix for crash when deleting an object that was used in a dupli cache.

[Lukas Tönne]

Commit: c86606eeba10a31b5b1cf25fa0cd55e253e29368
Author: Lukas Tönne
Date:   Tue Mar 24 18:17:22 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBc86606eeba10a31b5b1cf25fa0cd55e253e29368

Fix for crash when deleting an object that was used in a dupli cache.

Object-unlink was clearing the linked object's dupli cache instead of
the duplicator.

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index aeb8c04..0f0c0ae 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -689,7 +689,7 @@ void BKE_object_unlink(Object *ob)
 
 		/* dupli cache is cleared entirely if the object in question is duplified to keep it simple */
 		if (BKE_object_dupli_cache_contains(obt, ob))
-			BKE_object_dupli_cache_clear(ob);
+			BKE_object_dupli_cache_clear(obt);
 
 		obt = obt->id.next;
 	}