[Bf-blender-cvs] [e10ddc7] master: Get rid of BKE_key_make_local().

[Bastien Montagne]

Commit: e10ddc7a91b840eb630626665d987f498a7e9254
Author: Bastien Montagne
Date:   Thu Jul 14 13:07:45 2016 +0200
Branches: master
https://developer.blender.org/rBe10ddc7a91b840eb630626665d987f498a7e9254

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.

===================================================================

M	source/blender/blenkernel/BKE_key.h
M	source/blender/blenkernel/intern/curve.c
M	source/blender/blenkernel/intern/key.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/mesh.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index b559152..e590ff1 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 fa7dac5..596890d 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 c61aee7..a524f92 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 9d4f141..0babe1d 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, &lt->id);
 			if (lt->key) {
-				BKE_key_make_local(bmain, lt->key, force_local);
+				id_clear_lib_data(bmain, &lt->key->id);
 			}
 			BKE_id_expand_local(&lt->id);
 		}
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 4680d48..c239008 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 1dd22f4..db15dc1 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);
 		}