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/particle.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/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 4136f866f6a..6e13ce87172 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3304,12 +3304,12 @@ void BKE_particlesettings_rough_curve_init(ParticleSettings *part) part->roughcurve = cumap; } -ParticleSettings *BKE_particlesettings_copy(ParticleSettings *part) +ParticleSettings *BKE_particlesettings_copy(Main *bmain, ParticleSettings *part) { ParticleSettings *partn; int a; - partn = BKE_libblock_copy(&part->id); + partn = BKE_libblock_copy(bmain, &part->id); partn->pd = MEM_dupallocN(part->pd); partn->pd2 = MEM_dupallocN(part->pd2); partn->effector_weights = MEM_dupallocN(part->effector_weights); @@ -3333,7 +3333,7 @@ ParticleSettings *BKE_particlesettings_copy(ParticleSettings *part) BLI_duplicatelist(&partn->dupliweights, &part->dupliweights); if (ID_IS_LINKED_DATABLOCK(part)) { - BKE_id_lib_local_paths(G.main, part->id.lib, &partn->id); + BKE_id_lib_local_paths(bmain, part->id.lib, &partn->id); } return partn; @@ -3383,7 +3383,7 @@ void BKE_particlesettings_make_local(ParticleSettings *part) expand_local_particlesettings(part); } else if (is_local && is_lib) { - ParticleSettings *part_new = BKE_particlesettings_copy(part); + ParticleSettings *part_new = BKE_particlesettings_copy(bmain, part); part_new->id.us = 0; /* Remap paths of new ID using old library as base. */ |