Commit: e95ba11ce677a8ef5483190f8b58da5611d93f84
Author: Bastien Montagne
Date: Mon Oct 12 20:31:39 2015 +0200
Branches: free-refcount-ids
https://developer.blender.org/rBe95ba11ce677a8ef5483190f8b58da5611d93f84
Merge branch 'master' into free-refcount-ids
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/object.c
index ee93750,e5f826f..4ef30c0
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -478,7 -462,12 +478,7 @@@ void BKE_object_free(Object *ob, const
BKE_previewimg_free(&ob->preview);
}
- static void unlink_object__unlinkModifierLinks(void *userData, Object *ob,
Object **obpoin)
-void BKE_object_free(Object *ob)
-{
- BKE_object_free_ex(ob, true);
-}
-
+ static void unlink_object__unlinkModifierLinks(void *userData, Object *ob,
Object **obpoin, int UNUSED(cd_flag))
{
Object *unlinkOb = userData;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
