Cleanup/Refactor: pass Main pointer to all ID copy functions.

Also allows us to get rid of a few _copy_ex() versions...

1 files changed, 2 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index ed8095444a4..2b7968eec1d 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -150,12 +150,12 @@ Key *BKE_key_add(ID *id)    /* common function */
 	return key;
 }
 
-Key *BKE_key_copy_ex(Main *bmain, Key *key)
+Key *BKE_key_copy(Main *bmain, Key *key)
 {
 	Key *keyn;
 	KeyBlock *kbn, *kb;
 	
-	keyn = BKE_libblock_copy_ex(bmain, &key->id);
+	keyn = BKE_libblock_copy(bmain, &key->id);
 	
 	BLI_duplicatelist(&keyn->block, &key->block);
 	
@@ -177,11 +177,6 @@ Key *BKE_key_copy_ex(Main *bmain, Key *key)
 	return keyn;
 }
 
-Key *BKE_key_copy(Key *key)
-{
-	return BKE_key_copy_ex(G.main, key);
-}
-
 Key *BKE_key_copy_nolib(Key *key)
 {
 	Key *keyn;