diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:27:15 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-11 22:30:02 +0300 |
commit | 7212ebd09f9720883581221be923ae5e97ff5d76 (patch) | |
tree | 546606626647d473ae9d4a037ce8e24e17943e08 /source/blender/blenkernel/intern/armature.c | |
parent | 3b8e0606e1cfa484971d09c5060a78dbadbe1569 (diff) |
Remove usercount handling from BKE_id_expand_local.
Idea looked good, but we have too much custom situations here (some half-fake-sub-ID
being copied with their 'owner', animdata, etc.), let's let datablock copy functions
handle that themselves.
Also allows to safely call BKE_id_expand_local from all copy functions now (only when
copying linked data).
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 47fa0e9ca7f..5f564e1c4d2 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -162,7 +162,7 @@ void BKE_armature_make_local(Main *bmain, bArmature *arm) if (is_local) { if (!is_lib) { id_clear_lib_data(bmain, &arm->id); - BKE_id_expand_local(&arm->id, false); + BKE_id_expand_local(&arm->id); } else { bArmature *arm_new = BKE_armature_copy(bmain, arm); @@ -219,9 +219,8 @@ bArmature *BKE_armature_copy(Main *bmain, bArmature *arm) newArm->act_edbone = NULL; newArm->sketch = NULL; - BKE_id_expand_local(&newArm->id, true); - if (ID_IS_LINKED_DATABLOCK(arm)) { + BKE_id_expand_local(&newArm->id); BKE_id_lib_local_paths(bmain, arm->id.lib, &newArm->id); } |