diff --git a/source/blender/include/BIF_keyframing.h b/source/blender/include/BIF_keyframing.h
index 9ade4f74b92..eeaef957b90 100644
--- a/source/blender/include/BIF_keyframing.h
+++ b/source/blender/include/BIF_keyframing.h
@@ -1,5 +1,5 @@
 /**
- * $Id: BDR_gpencil.h 14444 2008*04*16 22:40:48Z aligorith $
+ * $Id: BIF_keyframing.h 14444 2008-04-16 22:40:48Z aligorith $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index bb2beaae820..71e5ff6c10e 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -66,6 +66,7 @@
 #include "BIF_glutil.h"
 #include "BIF_graphics.h"
 #include "BIF_interface.h"
+#include "BIF_keyframing.h"
 #include "BIF_keyval.h"
 #include "BIF_mainqueue.h"
 #include "BIF_mywindow.h"
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index 33eb5262c3d..f36719a1c9c 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -78,6 +78,7 @@
 #include "BIF_drawgpencil.h"
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
+#include "BIF_keyframing.h"
 #include "BIF_resources.h"
 #include "BIF_screen.h"
 #include "BIF_mywindow.h"
diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c
index ce798064632..cf12e171a9c 100644
--- a/source/blender/src/editkey.c
+++ b/source/blender/src/editkey.c
@@ -70,6 +70,7 @@
 
 #include "BIF_editkey.h"
 #include "BIF_editview.h"
+#include "BIF_keyframing.h"
 #include "BIF_mywindow.h"
 #include "BIF_screen.h"
 #include "BIF_space.h"
diff --git a/source/blender/src/keyframing.c b/source/blender/src/keyframing.c
index b2fad5e85ce..fd9b19cc3b0 100644
--- a/source/blender/src/keyframing.c
+++ b/source/blender/src/keyframing.c
@@ -1284,7 +1284,6 @@ static void commonkey_context_getv3d (ListBase *sources, bKeyingContext **ksc)
 }
 
 /* helper for commonkey_context_get() -  get keyingsets for buttons window */
-// nb - for mtex entries... need to set map (= texchan_to_adrcode(id->texact)
 static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 {
 	bCommonKeySrc *cks;
@@ -1304,6 +1303,7 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 				
 				/* set data */
 				cks->id= (ID *)ma;
+				cks->ipo= ma->ipo;
 				cks->map= texchannel_to_adrcode(ma->texact);
 				
 				/* set keyingsets */
@@ -1321,6 +1321,7 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 				
 				/* set data */
 				cks->id= (ID *)wo;
+				cks->ipo= wo->ipo;
 				cks->map= texchannel_to_adrcode(wo->texact);
 				
 				/* set keyingsets */
@@ -1338,6 +1339,7 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 				
 				/* set data */
 				cks->id= (ID *)la;
+				cks->ipo= la->ipo;
 				cks->map= texchannel_to_adrcode(la->texact);
 				
 				/* set keyingsets */
@@ -1347,14 +1349,15 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 				break;
 			case TAB_SHADING_TEX: /* >------------- Texture Tab -------------< */
 			{
-				Tex *te= G.buts->lockpoin;
+				Tex *tex= G.buts->lockpoin;
 				
 				/* add new keyframing destination */
 				cks= MEM_callocN(sizeof(bCommonKeySrc), "bCommonKeySrc");
 				BLI_addtail(sources, cks); 
 				
 				/* set data */
-				cks->id= (ID *)te;
+				cks->id= (ID *)tex;
+				cks->ipo= tex->ipo;
 				
 				/* set keyingsets */
 				*ksc= &ks_contexts[KSC_BUTS_TEX];
@@ -1375,6 +1378,7 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 				
 				/* set id-block to key to */
 				cks->id= (ID *)ob;
+				cks->ipo= ob->ipo;
 				
 				/* set keyingsets */
 				*ksc= &ks_contexts[KSC_BUTS_OB];
@@ -1387,13 +1391,16 @@ static void commonkey_context_getsbuts (ListBase *sources, bKeyingContext **ksc)
 		{
 			Object *ob= OBACT;
 			
-			if ((ob) && (ob->type==OB_CAMERA)) { /* >---------------- camera buttons ---------------< */
+			if ((ob) && (ob->type==OB_CAMERA) && (G.buts->lockpoin)) { /* >---------------- camera buttons ---------------< */
+				Camera *ca= G.buts->lockpoin;
+				
 				/* add new keyframing destination */
 				cks= MEM_callocN(sizeof(bCommonKeySrc), "bCommonKeySrc");
 				BLI_addtail(sources, cks);
 				
 				/* set id-block to key to */
-				cks->id= (ID *)ob;
+				cks->id= (ID *)ca;
+				cks->ipo= ca->ipo;
 				
 				/* set keyingsets */
 				*ksc= &ks_contexts[KSC_BUTS_CAM];