Cleanup and new features for vertex keys.

User doc: http://www.blender3d.org/cms/Shape_Keys.678.0.html

- The mixed use of "Vertex Key","Key" or "RVK" in Blender was a bit
confusing. Also a 'vertex key' assumes keys per vertex, which actually is
only a single key for the entire shape. The discussions on blender.org
forums all mentioned "Shape" or "Blend Shapes", which I think is an OK
name for a "Vertex Key" in the UI. :)

- Most work was code spaghetti cleanup. Doing shape-keys now nicely goes
via the depgraph and DerivedMesh. That then allows to have different
shapes per object, with the new "Pin" feature.
Objects now define what Shape is shown (ob->shapenr)

- Added a Shape Panel in the Edit buttons with the various options

- Fixed a lot of issues in the IpoWindow, with drawing the channels.
For example, deleting a key-line there caused the entire Relative option to
go wrong, same for moving the lines up/down.
Changing key-line order now reflects in order of channels. The active
Shape is drawn more clear now too.

- Noticed it doesnt work yet for curves/lattice. Need modifier advise!

4 files changed, 24 insertions, 15 deletions

diff --git a/source/blender/include/BIF_editkey.h b/source/blender/include/BIF_editkey.h
index 46f9d8e2aa4..ff78f78da2b 100644
--- a/source/blender/include/BIF_editkey.h
+++ b/source/blender/include/BIF_editkey.h
@@ -39,25 +39,27 @@ struct Mesh;
 struct Object;
 struct Lattice;
 struct Curve;
+struct uiBlock;
 
 void mesh_to_key(struct Mesh *me, struct KeyBlock *kb);
 void key_to_mesh(struct KeyBlock *kb, struct Mesh *me);
-void insert_meshkey(struct Mesh *me, short offline);
+void insert_meshkey(struct Mesh *me, short rel);
 
 void latt_to_key(struct Lattice *lt, struct KeyBlock *kb);
 void key_to_latt(struct KeyBlock *kb, struct Lattice *lt);
-void insert_lattkey(struct Lattice *lt);
+void insert_lattkey(struct Lattice *lt, short rel);
 
 void curve_to_key(struct Curve *cu, struct KeyBlock *kb, ListBase *nurb);
 void key_to_curve(struct KeyBlock *kb, struct Curve  *cu, ListBase *nurb);
-void insert_curvekey(struct Curve *cu);
+void insert_curvekey(struct Curve *cu, short rel);
 
-struct Key *give_current_key(struct Object *ob);
-void showkeypos(struct Key *key, struct KeyBlock *kb);
+void insert_shapekey(struct Object *ob);
 
-void deselectall_key(void);
-void delete_key(void);
-void move_keys(void);
+void delete_key(struct Object *ob);
+void move_keys(struct Object *ob);
+
+void make_rvk_slider(struct uiBlock *block, struct Key *key, int i,
+							int x, int y, int w, int h, char *tip);
 
 #endif
 
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index 9b4f92c9d1b..7040c781927 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -54,8 +54,8 @@ typedef enum {
 	ICON_SPACE2,
 	ICON_SPACE3,
 	ICON_SPACE4,
-	ICON_SPACE5,
-	ICON_SPACE6,
+	ICON_TRIA_LEFT,
+	ICON_TRIA_UP,
 
 	ICON_ORTHO,
 	ICON_PERSP,
@@ -76,8 +76,8 @@ typedef enum {
 	ICON_SORTSIZE,
 	ICON_LONGDISPLAY,
 	ICON_SHORTDISPLAY,
-	ICON_TRIA_OPEN,
-	ICON_TRIA_CLOSED,
+	ICON_TRIA_DOWN,
+	ICON_TRIA_RIGHT,
 
 	ICON_VIEW_AXIS_ALL,
 	ICON_VIEW_AXIS_NONE,
diff --git a/source/blender/include/BSE_editipo.h b/source/blender/include/BSE_editipo.h
index ccdbb8a8324..8b5139f14e7 100644
--- a/source/blender/include/BSE_editipo.h
+++ b/source/blender/include/BSE_editipo.h
@@ -59,7 +59,7 @@ char *getname_key_ei(int nr);
 char *getname_la_ei(int nr);
 char *getname_cam_ei(int nr);
 char *getname_snd_ei(int nr);
-struct IpoCurve *find_ipocurve(struct Ipo *ipo, int adrcode);
+
 void boundbox_ipocurve(struct IpoCurve *icu);
 void boundbox_ipo(struct Ipo *ipo, struct rctf *bb);
 void editipo_changed(struct SpaceIpo *si, int doredraw);
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index 76d2069a9a9..0557a6110bd 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -325,9 +325,17 @@ enum {
 #define B_DOCENTRENEW	2016
 #define B_DOCENTRECURSOR	2017
 
-	/* 32 values! */
+	/* 20 values! */
 #define B_OBLAY			2019
 
+#define B_ADDKEY		2041
+#define B_SETKEY		2042
+#define B_DELKEY		2043
+#define B_NAMEKEY		2044
+#define B_PREVKEY		2045
+#define B_NEXTKEY		2046
+#define B_LOCKKEY		2047
+
 #define B_MESHBUTS		2100
 
 #define B_FLIPNORM		2050
@@ -367,7 +375,6 @@ enum {
 #define B_DRAWEDGES		2087
 #define B_DRAWCREASES	2088
 
-
 /* *********************** */
 #define B_CURVEBUTS		2200