diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-14 14:07:45 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-14 19:33:12 +0300 |
commit | e10ddc7a91b840eb630626665d987f498a7e9254 (patch) | |
tree | 654744ac470e885940ce123d8e055042b0fb3656 /source/blender/blenkernel | |
parent | f87603662d03bf908094ed7a7f002a07bf13be38 (diff) |
Get rid of BKE_key_make_local().
This function was only a wrapper around id_clear_lib_data(), and shapekeys
are not linkable nor shareable anyway, no point keeping this currently,
was only adding confusion about shapekey 'status' as a datatblock.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_key.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/key.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
6 files changed, 4 insertions, 18 deletions
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h index b55915276b1..e590ff148d7 100644 --- a/source/blender/blenkernel/BKE_key.h +++ b/source/blender/blenkernel/BKE_key.h @@ -53,7 +53,6 @@ void BKE_key_free_nolib(struct Key *key); struct Key *BKE_key_add(struct ID *id); struct Key *BKE_key_copy(struct Main *bmain, struct Key *key); struct Key *BKE_key_copy_nolib(struct Key *key); -void BKE_key_make_local(struct Main *bmain, struct Key *key, const bool force_local); void BKE_key_sort(struct Key *key); void key_curve_position_weights(float t, float data[4], int type); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index fa7dac5d432..596890da24d 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -234,7 +234,7 @@ void BKE_curve_make_local(Main *bmain, Curve *cu, const bool force_local) if (!is_lib) { id_clear_lib_data(bmain, &cu->id); if (cu->key) { - BKE_key_make_local(bmain, cu->key, force_local); + id_clear_lib_data(bmain, &cu->key->id); } BKE_id_expand_local(&cu->id); } diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index c61aee704d2..a524f927cad 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -203,18 +203,6 @@ Key *BKE_key_copy_nolib(Key *key) return keyn; } -void BKE_key_make_local(Main *bmain, Key *key, const bool UNUSED(force_local)) -{ - /* Note that here for now we simply just make it local... - * Sounds fishy behavior, but since skeys are not *real* IDs... */ - - if (!ID_IS_LINKED_DATABLOCK(key)) { - return; - } - - id_clear_lib_data(bmain, &key->id); -} - /* Sort shape keys and Ipo curves after a change. This assumes that at most * one key was moved, which is a valid assumption for the places it's * currently being called. diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 9d4f14110a2..0babe1d317c 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -349,7 +349,7 @@ void BKE_lattice_make_local(Main *bmain, Lattice *lt, const bool force_local) if (!is_lib) { id_clear_lib_data(bmain, <->id); if (lt->key) { - BKE_key_make_local(bmain, lt->key, force_local); + id_clear_lib_data(bmain, <->key->id); } BKE_id_expand_local(<->id); } diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 4680d481ff6..c2390085ad2 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -317,8 +317,7 @@ bool id_make_local(Main *bmain, ID *id, const bool test, const bool force_local) case ID_IP: return false; /* deprecated */ case ID_KE: - if (!test) BKE_key_make_local(bmain, (Key *)id, force_local); - return true; + return false; /* can't be linked */ case ID_WO: if (!test) BKE_world_make_local(bmain, (World *)id, force_local); return true; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 1dd22f4a32b..db15dc18da4 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -574,7 +574,7 @@ void BKE_mesh_make_local(Main *bmain, Mesh *me, const bool force_local) if (!is_lib) { id_clear_lib_data(bmain, &me->id); if (me->key) { - BKE_key_make_local(bmain, me->key, force_local); + id_clear_lib_data(bmain, &me->key->id); } BKE_id_expand_local(&me->id); } |