Minor Code Cleanup (ShapeKeys):

Added a new API method for ShapeKeys, which is useful for finding a certain KeyBlock from a Key. 

1 files changed, 9 insertions, 17 deletions

diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c
index 15840614d2a..47bd06664c2 100644
--- a/source/blender/src/editipo_lib.c
+++ b/source/blender/src/editipo_lib.c
@@ -148,24 +148,16 @@ char *getname_ipocurve(IpoCurve *icu, Object *ob)
 			{
 				static char name[32];
 				Key *key= ob_get_key(ob);
+				KeyBlock *kb= key_get_keyblock(key, icu->adrcode);
 				
-				if (key) {
-					KeyBlock *kb= key->block.first;
-					int i;
-					
-					for (i= 1; i < key->totkey; i++) {
-						kb= kb->next;
-						
-						if (icu->adrcode == i) {
-							/* only return name if it has been set, otherwise use 
-							 * default method using static string (Key #)
-							 */
-							if (kb->name[0] == '\0')
-								break; /* stop looping through keyblocks */
-							else
-								return kb->name; /* return keyblock's name  */
-						}
-					}
+				if (kb) {
+					/* only return name if it has been set, otherwise use 
+					 * default method using static string (Key #)
+					 */
+					if (kb->name[0] == '\0')
+						break; /* stop looping through keyblocks */
+					else
+						return kb->name; /* return keyblock's name  */
 				}
 				
 				/* in case keyblock is not named or no key/keyblock was found */