Commit: bc38b89ccd32f5ff14e07e91e8f477c9e12d4e0f
Author: Lukas Tönne
Date: Tue Mar 24 18:17:22 2015 +0100
Branches: alembic
https://developer.blender.org/rBbc38b89ccd32f5ff14e07e91e8f477c9e12d4e0f
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 744a821..6d45c6e 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
