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/mask.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/mask.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mask.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index dabdb4c81c6..f804a4c3919 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -848,11 +848,11 @@ Mask *BKE_mask_copy_nolib(Mask *mask) return mask_new; } -Mask *BKE_mask_copy(Mask *mask) +Mask *BKE_mask_copy(Main *bmain, Mask *mask) { Mask *mask_new; - mask_new = BKE_libblock_copy(&mask->id); + mask_new = BKE_libblock_copy(bmain, &mask->id); BLI_listbase_clear(&mask_new->masklayers); @@ -862,7 +862,7 @@ Mask *BKE_mask_copy(Mask *mask) id_fake_user_set(&mask->id); if (ID_IS_LINKED_DATABLOCK(mask)) { - BKE_id_lib_local_paths(G.main, mask->id.lib, &mask_new->id); + BKE_id_lib_local_paths(bmain, mask->id.lib, &mask_new->id); } return mask_new; |