[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16517] trunk/blender/source/blender: More bugfixes:

[Joshua Leung]

Revision: 16517
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16517
Author:   aligorith
Date:     2008-09-14 07:52:57 +0200 (Sun, 14 Sep 2008)

Log Message:
-----------
More bugfixes:

* Added missing includes
* Fixed typos in header
* Added code to get ipo for 'Available' keyingsets to work

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_keyframing.h
    trunk/blender/source/blender/src/buttons_object.c
    trunk/blender/source/blender/src/drawaction.c
    trunk/blender/source/blender/src/editkey.c
    trunk/blender/source/blender/src/keyframing.c

Modified: trunk/blender/source/blender/include/BIF_keyframing.h
===================================================================
--- trunk/blender/source/blender/include/BIF_keyframing.h	2008-09-14 05:42:05 UTC (rev 16516)
+++ trunk/blender/source/blender/include/BIF_keyframing.h	2008-09-14 05:52:57 UTC (rev 16517)
@@ -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 *****
  *

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-09-14 05:42:05 UTC (rev 16516)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-09-14 05:52:57 UTC (rev 16517)
@@ -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"

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2008-09-14 05:42:05 UTC (rev 16516)
+++ trunk/blender/source/blender/src/drawaction.c	2008-09-14 05:52:57 UTC (rev 16517)
@@ -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"

Modified: trunk/blender/source/blender/src/editkey.c
===================================================================
--- trunk/blender/source/blender/src/editkey.c	2008-09-14 05:42:05 UTC (rev 16516)
+++ trunk/blender/source/blender/src/editkey.c	2008-09-14 05:52:57 UTC (rev 16517)
@@ -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"

Modified: trunk/blender/source/blender/src/keyframing.c
===================================================================
--- trunk/blender/source/blender/src/keyframing.c	2008-09-14 05:42:05 UTC (rev 16516)
+++ trunk/blender/source/blender/src/keyframing.c	2008-09-14 05:52:57 UTC (rev 16517)
@@ -1284,7 +1284,6 @@
 }
 
 /* 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 @@
 				
 				/* set data */
 				cks->id= (ID *)ma;
+				cks->ipo= ma->ipo;
 				cks->map= texchannel_to_adrcode(ma->texact);
 				
 				/* set keyingsets */
@@ -1321,6 +1321,7 @@
 				
 				/* set data */
 				cks->id= (ID *)wo;
+				cks->ipo= wo->ipo;
 				cks->map= texchannel_to_adrcode(wo->texact);
 				
 				/* set keyingsets */
@@ -1338,6 +1339,7 @@
 				
 				/* set data */
 				cks->id= (ID *)la;
+				cks->ipo= la->ipo;
 				cks->map= texchannel_to_adrcode(la->texact);
 				
 				/* set keyingsets */
@@ -1347,14 +1349,15 @@
 				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 @@
 				
 				/* 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 @@
 		{
 			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];