- decided it made more sense to make a key_get_active function, switched

   to that in editmesh as well as for edit{curve,lattice}
 - added a G.editModeTitleExtra string that gets displayed in header info
   string in editmode. currently used to display "(Key)" when editing a
   key (before there was not UI level display of this info).

5 files changed, 16 insertions, 12 deletions

diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index f7160eb1a13..24b555e3cce 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -80,6 +80,7 @@ typedef struct Global {
     struct Scene *scene;				/* denk aan file.c */
     struct bScreen *curscreen;
     struct Object *obedit;
+	char editModeTitleExtra[64];
 	
     /* fonts, allocated global data */
     struct BMF_Font *font, *fonts, *fontss;
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 22b20e28b89..59984389f21 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -60,5 +60,7 @@ void do_spec_key(struct Key *key);
 
 void unlock_all_keys(void);
 
+struct KeyBlock *key_get_active(struct Key *keyData);
+
 #endif
 
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 89f691af535..c20f0fd3e4e 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -80,7 +80,6 @@ void mesh_set_smooth_flag(struct Object *meshOb, int enableSmooth);
 
 struct BoundBox *mesh_get_bb(struct Mesh *me);
 void mesh_get_texspace(struct Mesh *me, float *loc_r, float *rot_r, float *size_r);
-struct KeyBlock *mesh_get_active_key(struct Mesh *me);
 
 void make_edges(struct Mesh *me);
 
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index d9218d78a27..3425a2ff85d 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1206,3 +1206,16 @@ void do_spec_key(Key *key)
 	else if(idcode==ID_LT) do_latt_key( (Lattice *)key->from);
 	
 }
+
+KeyBlock *key_get_active(Key *keyData) 
+{
+	if (keyData) {
+		KeyBlock *key;
+
+		for (key=keyData->block.first; key; key= key->next)
+			if (key->flag&SELECT)
+				return key;
+	}
+
+	return NULL;
+}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index f9737f1e11b..f9f1285a5be 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1287,14 +1287,3 @@ void mesh_set_smooth_flag(Object *meshOb, int enableSmooth) {
 
 	DAG_object_flush_update(G.scene, meshOb, OB_RECALC_DATA);
 }
-
-KeyBlock *mesh_get_active_key(Mesh *me) 
-{
-	KeyBlock *key;
-
-	for (key=me->key->block.first; key; key= key->next)
-		if (key->flag&SELECT)
-			break;
-
-	return key;
-}