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/armature.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/armature.c')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 572490f937c..4ed0196ba9d 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -168,7 +168,7 @@ void BKE_armature_make_local(bArmature *arm) id_clear_lib_data(bmain, &arm->id); } else if (is_local && is_lib) { - bArmature *arm_new = BKE_armature_copy(arm); + bArmature *arm_new = BKE_armature_copy(bmain, arm); arm_new->id.us = 0; /* Remap paths of new ID using old library as base. */ @@ -208,13 +208,13 @@ static void copy_bonechildren(Bone *newBone, Bone *oldBone, Bone *actBone, Bone } } -bArmature *BKE_armature_copy(bArmature *arm) +bArmature *BKE_armature_copy(Main *bmain, bArmature *arm) { bArmature *newArm; Bone *oldBone, *newBone; Bone *newActBone = NULL; - newArm = BKE_libblock_copy(&arm->id); + newArm = BKE_libblock_copy(bmain, &arm->id); BLI_duplicatelist(&newArm->bonebase, &arm->bonebase); /* Duplicate the childrens' lists */ @@ -232,7 +232,7 @@ bArmature *BKE_armature_copy(bArmature *arm) newArm->sketch = NULL; if (ID_IS_LINKED_DATABLOCK(arm)) { - BKE_id_lib_local_paths(G.main, arm->id.lib, &newArm->id); + BKE_id_lib_local_paths(bmain, arm->id.lib, &newArm->id); } return newArm; |