diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 15:52:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 15:52:00 +0300 |
| commit | 87b974caa1e2b780c8031d67a42488039036c489 (patch) | |
| tree | 6776b8d35f25b2c458f90e0ba4cfa497782ebc30 /source/blender/blenkernel/intern/mball.c | |
| parent | ae2033aca2047afbfe0bf449bcd01b5b79a124b8 (diff) | |
Cleanup/Refactor: pass Main pointer to all ID copy functions.
Also allows us to get rid of a few _copy_ex() versions...
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mball.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index c6e6bb86659..0a29b2d53fd 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -102,12 +102,12 @@ MetaBall *BKE_mball_add(Main *bmain, const char *name) return mb; } -MetaBall *BKE_mball_copy_ex(Main *bmain, MetaBall *mb) +MetaBall *BKE_mball_copy(Main *bmain, MetaBall *mb) { MetaBall *mbn; int a; - mbn = BKE_libblock_copy_ex(bmain, &mb->id); + mbn = BKE_libblock_copy(bmain, &mb->id); BLI_duplicatelist(&mbn->elems, &mb->elems); @@ -126,11 +126,6 @@ MetaBall *BKE_mball_copy_ex(Main *bmain, MetaBall *mb) return mbn; } -MetaBall *BKE_mball_copy(MetaBall *mb) -{ - return BKE_mball_copy_ex(G.main, mb); -} - static int extern_local_mball_callback( void *UNUSED(user_data), struct ID *UNUSED(id_self), struct ID **id_pointer, int cd_flag) { @@ -167,7 +162,7 @@ void BKE_mball_make_local(Main *bmain, MetaBall *mb) extern_local_mball(mb); } else { - MetaBall *mb_new = BKE_mball_copy_ex(bmain, mb); + MetaBall *mb_new = BKE_mball_copy(bmain, mb); mb_new->id.us = 0; |