2.5: Restoring Auto-Keyframing for Transforms

Auto-Keyframing does not work anywhere else yet, and probably won't for a while.

source/blender/editors/armature/poselib.c

@@ -1203,7 +1203,7 @@ static void poselib_preview_cleanup (Scene *scene, tPoseLib_PreviewData *pld)
 		DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 		
 		/* updates */
-		if (IS_AUTOKEY_MODE(NORMAL)) {
+		if (IS_AUTOKEY_MODE(scene, NORMAL)) {
 			remake_action_ipos(ob->action);
 			
 		}

source/blender/editors/armature/poseobject.c

@@ -893,7 +893,7 @@ void paste_posebuf (Scene *scene, int flip)
 	/* Update event for pose and deformation children */
 	DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
 	
-	if (IS_AUTOKEY_ON) {
+	if (IS_AUTOKEY_ON(scene)) {
 // XXX		remake_action_ipos(ob->action);
 	}
 	else {

source/blender/editors/include/ED_keyframing.h

@@ -95,9 +95,9 @@ void ANIM_OT_delete_keyframe_old(struct wmOperatorType *ot);
 
 /* Auto-Keying macros for use by various tools */
 	/* check if auto-keyframing is enabled (per scene takes presidence) */
-#define IS_AUTOKEY_ON			((scene) ? (scene->autokey_mode & AUTOKEY_ON) : (U.autokey_mode & AUTOKEY_ON))
+#define IS_AUTOKEY_ON(scene)	((scene) ? (scene->autokey_mode & AUTOKEY_ON) : (U.autokey_mode & AUTOKEY_ON))
 	/* check the mode for auto-keyframing (per scene takes presidence)  */
-#define IS_AUTOKEY_MODE(mode) 	((scene) ? (scene->autokey_mode == AUTOKEY_MODE_##mode) : (U.autokey_mode == AUTOKEY_MODE_##mode))
+#define IS_AUTOKEY_MODE(scene, mode) 	((scene) ? (scene->autokey_mode == AUTOKEY_MODE_##mode) : (U.autokey_mode == AUTOKEY_MODE_##mode))
 	/* check if a flag is set for auto-keyframing (as userprefs only!) */
 #define IS_AUTOKEY_FLAG(flag)	(U.autokey_flag & AUTOKEY_FLAG_##flag)
 

source/blender/editors/space_time/time_header.c

@@ -34,6 +34,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_windowmanager_types.h"
+#include "DNA_userdef_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -352,7 +353,6 @@ static uiBlock *time_framemenu(bContext *C, ARegion *ar, void *arg_unused)
 
 #define B_FLIPINFOMENU 0
 #define B_NEWFRAME 0
-#define AUTOKEY_ON 0
 #define B_DIFF 0
 
 
@@ -528,16 +528,18 @@ void time_header_buttons(const bContext *C, ARegion *ar)
 				 xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to End frame (Shift UpArrow)");
 	xco+= XIC+8;
 	
-	uiDefIconButBitS(block, TOG, AUTOKEY_ON, REDRAWINFO, ICON_REC,
-					 xco, yco, XIC, YIC, &(scene->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
-	xco+= XIC;
-	if (scene->autokey_mode & AUTOKEY_ON) {
-		uiDefButS(block, MENU, REDRAWINFO, 
-				  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
-				  xco, yco, (int)3.5*XIC, YIC, &(scene->autokey_mode), 0, 1, 0, 0, 
-				  "Mode of automatic keyframe insertion for Objects and Bones");
-		xco+= (4*XIC);
-	}
+	uiBlockBeginAlign(block);
+		uiDefIconButBitS(block, TOG, AUTOKEY_ON, REDRAWINFO, ICON_REC,
+						 xco, yco, XIC, YIC, &(scene->autokey_mode), 0, 0, 0, 0, "Automatic keyframe insertion for Objects and Bones");
+		xco+= XIC;
+		if (IS_AUTOKEY_ON(scene)) {
+			uiDefButS(block, MENU, REDRAWINFO, 
+					  "Auto-Keying Mode %t|Add/Replace Keys%x3|Replace Keys %x5", 
+					  xco, yco, (int)5.5*XIC, YIC, &(scene->autokey_mode), 0, 1, 0, 0, 
+					  "Mode of automatic keyframe insertion for Objects and Bones");
+			xco+= (6*XIC);
+		}
+	uiBlockEndAlign(block);
 	
 	xco+= 16;
 	
@@ -550,10 +552,10 @@ void time_header_buttons(const bContext *C, ARegion *ar)
 	MEM_freeN(menustr);
 	xco+= (6*XIC);
 	
-	uiDefIconButO(block, BUT, "ANIM_OT_delete_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_DEHLT, xco,yco,XIC,YIC, "Delete Keyframes for the Active Keying Set (Alt-I)");
-	xco+= XIC+4;
-	uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)");
-	xco+= XIC+4;
+	uiBlockBeginAlign(block);
+		uiDefIconButO(block, BUT, "ANIM_OT_delete_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_DEHLT, xco,yco,XIC,YIC, "Delete Keyframes for the Active Keying Set (Alt-I)");
+		uiDefIconButO(block, BUT, "ANIM_OT_insert_keyframe", WM_OP_INVOKE_REGION_WIN, ICON_KEY_HLT, xco,yco,XIC,YIC, "Insert Keyframes for the Active Keying Set (I)");
+	uiBlockEndAlign(block);
 	
 	xco+= 16;
 	

source/blender/editors/transform/transform.h

@@ -49,6 +49,7 @@ struct wmOperatorType;
 struct wmOperator;
 struct bContext;
 struct wmEvent;
+struct wmTimer;
 struct ARegion;
 
 typedef struct NDofInput {
@@ -249,6 +250,7 @@ typedef struct TransInfo {
 	struct ScrArea	*sa;
 	struct ARegion	*ar;
 	struct Scene	*scene;
+	struct wmTimer *animtimer;
     short       mval[2];        /* current mouse position               */
     struct Object   *obedit;
     void		*draw_handle;
@@ -467,9 +469,9 @@ void special_aftertrans_update(TransInfo *t);
 void transform_autoik_update(TransInfo *t, short mode);
 
 /* auto-keying stuff used by special_aftertrans_update */
-short autokeyframe_cfra_can_key(struct Object *ob);
-void autokeyframe_ob_cb_func(struct Object *ob, int tmode);
-void autokeyframe_pose_cb_func(struct Object *ob, int tmode, short targetless_ik);
+short autokeyframe_cfra_can_key(struct Scene *scene, struct Object *ob);
+void autokeyframe_ob_cb_func(struct Scene *scene, struct View3D *v3d, struct Object *ob, int tmode);
+void autokeyframe_pose_cb_func(struct Scene *scene, struct View3D *v3d, struct Object *ob, int tmode, short targetless_ik);
 
 /*********************** Constraints *****************************/
 

source/blender/editors/transform/transform_conversions.c

@@ -4086,69 +4086,33 @@ static void clear_trans_object_base_flags(TransInfo *t)
 }
 
 /* auto-keyframing feature - checks for whether anything should be done for the current frame */
-short autokeyframe_cfra_can_key(Object *ob)
+// TODO: this should probably be done per channel instead...
+short autokeyframe_cfra_can_key(Scene *scene, Object *ob)
 {
-#if 0 // TRANSFORM_FIX_ME
-	ListBase keys = {NULL, NULL};
-	ActKeyColumn *ak;
-	float cfra;
-	short found= 0;
+	float cfra= (float)CFRA; // XXX for now, this will do
 	
 	/* only filter if auto-key mode requires this */
-	if (IS_AUTOKEY_ON == 0)
+	if (IS_AUTOKEY_ON(scene) == 0)
 		return 0;
-	else if (IS_AUTOKEY_MODE(NORMAL)) 
+	else if (IS_AUTOKEY_MODE(scene, NORMAL)) 
 		return 1;
-	
-	/* sanity check */
-	if (ob == NULL) 
-		return 0;
-	
-	/* get keyframes that object has (bone anim is stored on ob too) */
-	if (ob->action)
-		action_to_keylist(ob->action, &keys, NULL, NULL);
-	else if (ob->ipo)
-		ipo_to_keylist(ob->ipo, &keys, NULL, NULL);
-	else
-		return 0;
-		
-	/* get current frame (will apply nla-scaling as necessary) */
-	// ack... this is messy...
-	cfra= frame_to_float(CFRA);
-	cfra= get_action_frame(ob, cfra);
-	
-	/* check if a keyframe occurs on current frame */
-	for (ak= keys.first; ak; ak= ak->next) {
-		if (IS_EQ(cfra, ak->cfra)) {
-			found= 1;
-			break;
-		}
-	}
-	
-	/* free temp list */
-	BLI_freelistN(&keys);
-	
-	return found;
-#endif
-return 0;
+	else 
+		return id_frame_has_keyframe(&ob->id, cfra, ANIMFILTER_KEYS_LOCAL);
 }
 
 /* auto-keyframing feature - for objects 
  * 	tmode: should be a transform mode 
  */
-void autokeyframe_ob_cb_func(Object *ob, int tmode)
+void autokeyframe_ob_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode)
 {
-#if 0 // TRANSFORM_FIX_ME
-	ID *id= (ID *)(ob);
-	IpoCurve *icu;
+	ID *id= &ob->id;
+	FCurve *fcu;
 	
-	if (autokeyframe_cfra_can_key(ob)) {
-		char *actname = NULL;
+	if (autokeyframe_cfra_can_key(scene, ob)) {
+		AnimData *adt= ob->adt;
+		float cfra= (float)CFRA; // xxx this will do for now
 		short flag = 0;
 		
-		if (ob->ipoflag & OB_ACTION_OB)
-			actname= "Object";
-			
 		if (IS_AUTOKEY_FLAG(INSERTNEEDED))
 			flag |= INSERTKEY_NEEDED;
 		if (IS_AUTOKEY_FLAG(AUTOMATKEY))
@@ -4156,22 +4120,10 @@ void autokeyframe_ob_cb_func(Object *ob, int tmode)
 		
 		if (IS_AUTOKEY_FLAG(INSERTAVAIL)) {
 			/* only key on available channels */
-			if ((ob->ipo) || (ob->action)) {
-				if (ob->action && actname) {
-					bActionChannel *achan;
-					achan= get_action_channel(ob->action, actname);
-					
-					if (achan && achan->ipo)
-						icu= achan->ipo->curve.first;
-					else
-						icu= NULL;
-				}
-				else 
-					icu= ob->ipo->curve.first;
-				
-				for (; icu; icu= icu->next) {
-					icu->flag &= ~IPO_SELECT;
-					insertkey(id, ID_OB, actname, NULL, icu->adrcode, flag);
+			if (adt && adt->action) {
+				for (fcu= adt->action->curves.first; fcu; fcu= fcu->next) {
+					fcu->flag &= ~FCURVE_SELECTED;
+					insertkey(id, ((fcu->grp)?(fcu->grp->name):(NULL)), fcu->rna_path, fcu->array_index, cfra, flag);
 				}
 			}
 		}
@@ -4183,88 +4135,85 @@ void autokeyframe_ob_cb_func(Object *ob, int tmode)
 				doLoc = 1;
 			}
 			else if (tmode == TFM_ROTATION) {
-				if (G.vd->around == V3D_ACTIVE) {
+				if (v3d->around == V3D_ACTIVE) {
 					if (ob != OBACT)
 						doLoc = 1;
 				}
-				else if (G.vd->around == V3D_CURSOR)
+				else if (v3d->around == V3D_CURSOR)
 					doLoc = 1;	
 				
-				if ((G.vd->flag & V3D_ALIGN)==0) 
+				if ((v3d->flag & V3D_ALIGN)==0) 
 					doRot = 1;
 			}
 			else if (tmode == TFM_RESIZE) {
-				if (G.vd->around == V3D_ACTIVE) {
+				if (v3d->around == V3D_ACTIVE) {
 					if (ob != OBACT)
 						doLoc = 1;
 				}
-				else if (G.vd->around == V3D_CURSOR)
+				else if (v3d->around == V3D_CURSOR)
 					doLoc = 1;	
 				
-				if ((G.vd->flag & V3D_ALIGN)==0)
+				if ((v3d->flag & V3D_ALIGN)==0)
 					doScale = 1;
 			}
 			
+			// TODO: the group names here are temporary...
+			// TODO: should this be made to use the builtin KeyingSets instead?
 			if (doLoc) {
-				insertkey(id, ID_OB, actname, NULL, OB_LOC_X, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_LOC_Y, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_LOC_Z, flag);
+				insertkey(id, "Object Transform", "location", 0, cfra, flag);
+				insertkey(id, "Object Transform", "location", 1, cfra, flag);
+				insertkey(id, "Object Transform", "location", 2, cfra, flag);
 			}
 			if (doRot) {
-				insertkey(id, ID_OB, actname, NULL, OB_ROT_X, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_ROT_Y, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_ROT_Z, flag);
+				insertkey(id, "Object Transform", "rotation", 0, cfra, flag);
+				insertkey(id, "Object Transform", "rotation", 1, cfra, flag);
+				insertkey(id, "Object Transform", "rotation", 2, cfra, flag);
 			}
 			if (doScale) {
-				insertkey(id, ID_OB, actname, NULL, OB_SIZE_X, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_SIZE_Y, flag);
-				insertkey(id, ID_OB, actname, NULL, OB_SIZE_Z, flag);
+				insertkey(id, "Object Transform", "scale", 0, cfra, flag);
+				insertkey(id, "Object Transform", "scale", 1, cfra, flag);
+				insertkey(id, "Object Transform", "scale", 2, cfra, flag);
 			}
 		}
 		else {
-			insertkey(id, ID_OB, actname, NULL, OB_LOC_X, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_LOC_Y, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_LOC_Z, flag);
+			// TODO: the group names here are temporary...
+			// TODO: should this be made to use the builtin KeyingSets instead?
+			insertkey(id, "Object Transform", "location", 0, cfra, flag);
+			insertkey(id, "Object Transform", "location", 1, cfra, flag);
+			insertkey(id, "Object Transform", "location", 2, cfra, flag);
 			
-			insertkey(id, ID_OB, actname, NULL, OB_ROT_X, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_ROT_Y, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_ROT_Z, flag);
+			insertkey(id, "Object Transform", "rotation", 0, cfra, flag);
+			insertkey(id, "Object Transform", "rotation", 1, cfra, flag);
+			insertkey(id, "Object Transform", "rotation", 2, cfra, flag);
 			
-			insertkey(id, ID_OB, actname, NULL, OB_SIZE_X, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_SIZE_Y, flag);
-			insertkey(id, ID_OB, actname, NULL, OB_SIZE_Z, flag);
+			insertkey(id, "Object Transform", "scale", 0, cfra, flag);
+			insertkey(id, "Object Transform", "scale", 1, cfra, flag);
+			insertkey(id, "Object Transform", "scale", 2, cfra, flag);
 		}
 		
-		remake_object_ipos(ob);
-		allqueue(REDRAWMARKER, 0);
-		allqueue(REDRAWOOPS, 0);
+		// XXX todo... find a way to send notifiers from here...
 	}
-#endif
 }
 
 /* auto-keyframing feature - for poses/pose-channels 
  * 	tmode: should be a transform mode 
  *	targetless_ik: has targetless ik been done on any channels?
  */
-void autokeyframe_pose_cb_func(Object *ob, int tmode, short targetless_ik)
+void autokeyframe_pose_cb_func(Scene *scene, View3D *v3d, Object *ob, int tmode, short targetless_ik)
 {
-#if 0 // TRANSFORM_FIX_ME	
-	ID *id= (ID *)(ob);
+	ID *id= &ob->id;
+	AnimData *adt= ob->adt;
 	bArmature *arm= ob->data;
-	bAction	*act;
-	bPose	*pose;
+	bAction	*act= (adt) ? adt->action : NULL;
+	bPose	*pose= ob->pose;
 	bPoseChannel *pchan;
-	IpoCurve *icu;
+	FCurve *fcu;
 	
-	pose= ob->pose;
-	act= ob->action;
-	
-	if (autokeyframe_cfra_can_key(ob)) {
+	if (autokeyframe_cfra_can_key(scene, ob)) {
+		float cfra= (float)CFRA;
 		short flag= 0;
+		char buf[512];
 		
-		if (act == NULL)
-			act= ob->action= add_empty_action("Action");
-			
 		if (IS_AUTOKEY_FLAG(INSERTNEEDED))
 			flag |= INSERTKEY_NEEDED;
 		if (IS_AUTOKEY_FLAG(AUTOMATKEY))
@@ -4277,12 +4226,9 @@ void autokeyframe_pose_cb_func(Object *ob, int tmode, short targetless_ik)
 				
 				/* only insert into available channels? */
 				if (IS_AUTOKEY_FLAG(INSERTAVAIL)) {
-					bActionChannel *achan; 
-					
-					achan= get_action_channel(act, pchan->name);
-					if (achan && achan->ipo) {
-						for (icu= achan->ipo->curve.first; icu; icu= icu->next)
-							insertkey(id, ID_PO, pchan->name, NULL, icu->adrcode, flag);
+					if (act) {
+						for (fcu= act->curves.first; fcu; fcu= fcu->next)
+							insertkey(id, ((fcu->grp)?(fcu->grp->name):(NULL)), fcu->rna_path, fcu->array_index, cfra, flag);
 					}
 				}
 				/* only insert keyframe if needed? */
@@ -4297,67 +4243,86 @@ void autokeyframe_pose_cb_func(Object *ob, int tmode, short targetless_ik)
 							doLoc = 1;
 					}
 					else if (tmode == TFM_ROTATION) {
-						if (ELEM(G.vd->around, V3D_CURSOR, V3D_ACTIVE))
+						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							doLoc = 1;
 							
-						if ((G.vd->flag & V3D_ALIGN)==0) 
+						if ((v3d->flag & V3D_ALIGN)==0) 
 							doRot = 1;
 					}
 					else if (tmode == TFM_RESIZE) {
-						if (ELEM(G.vd->around, V3D_CURSOR, V3D_ACTIVE))
+						if (ELEM(v3d->around, V3D_CURSOR, V3D_ACTIVE))
 							doLoc = 1;
 						
-						if ((G.vd->flag & V3D_ALIGN)==0)
+						if ((v3d->flag & V3D_ALIGN)==0)
 							doScale = 1;
 					}
 					
 					if (doLoc) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_X, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Y, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Z, flag);
+						sprintf(buf, "pose.pose_channels[\"%s\"].location", pchan->name);
+						insertkey(id, pchan->name, buf, 0, cfra, flag);
+						insertkey(id, pchan->name, buf, 1, cfra, flag);
+						insertkey(id, pchan->name, buf, 2, cfra, flag);
 					}
 					if (doRot) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_W, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_X, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Y, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Z, flag);
+						if (pchan->rotmode == PCHAN_ROT_QUAT) {
+							sprintf(buf, "pose.pose_channels[\"%s\"].rotation", pchan->name);
+							insertkey(id, pchan->name, buf, 0, cfra, flag);
+							insertkey(id, pchan->name, buf, 1, cfra, flag);
+							insertkey(id, pchan->name, buf, 2, cfra, flag);
+							insertkey(id, pchan->name, buf, 3, cfra, flag);
+						}
+						else {
+							sprintf(buf, "pose.pose_channels[\"%s\"].euler_rotation", pchan->name);
+							insertkey(id, pchan->name, buf, 0, cfra, flag);
+							insertkey(id, pchan->name, buf, 1, cfra, flag);
+							insertkey(id, pchan->name, buf, 2, cfra, flag);
+						}
 					}
 					if (doScale) {
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_X, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Y, flag);
-						insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Z, flag);
+						sprintf(buf, "pose.pose_channels[\"%s\"].scale", pchan->name);
+						insertkey(id, pchan->name, buf, 0, cfra, flag);
+						insertkey(id, pchan->name, buf, 1, cfra, flag);
+						insertkey(id, pchan->name, buf, 2, cfra, flag);
 					}
 				}
 				/* insert keyframe in any channel that's appropriate */
 				else {
-					insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_X, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Y, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_SIZE_Z, flag);
+					sprintf(buf, "pose.pose_channels[\"%s\"].location", pchan->name);
+					insertkey(id, pchan->name, buf, 0, cfra, flag);
+					insertkey(id, pchan->name, buf, 1, cfra, flag);
+					insertkey(id, pchan->name, buf, 2, cfra, flag);
 					
-					insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_W, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_X, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Y, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_QUAT_Z, flag);
+					if (pchan->rotmode == PCHAN_ROT_QUAT) {
+						sprintf(buf, "pose.pose_channels[\"%s\"].rotation", pchan->name);
+						insertkey(id, pchan->name, buf, 0, cfra, flag);
+						insertkey(id, pchan->name, buf, 1, cfra, flag);
+						insertkey(id, pchan->name, buf, 2, cfra, flag);
+						insertkey(id, pchan->name, buf, 3, cfra, flag);
+					}
+					else {
+						sprintf(buf, "pose.pose_channels[\"%s\"].euler_rotation", pchan->name);
+						insertkey(id, pchan->name, buf, 0, cfra, flag);
+						insertkey(id, pchan->name, buf, 1, cfra, flag);
+						insertkey(id, pchan->name, buf, 2, cfra, flag);
+					}
 					
-					insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_X, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Y, flag);
-					insertkey(id, ID_PO, pchan->name, NULL, AC_LOC_Z, flag);
+					sprintf(buf, "pose.pose_channels[\"%s\"].scale", pchan->name);
+					insertkey(id, pchan->name, buf, 0, cfra, flag);
+					insertkey(id, pchan->name, buf, 1, cfra, flag);
+					insertkey(id, pchan->name, buf, 2, cfra, flag);
 				}
 			}
 		}
 		
-		remake_action_ipos(act);
-		allqueue(REDRAWMARKER, 0);
-		allqueue(REDRAWOOPS, 0);
-		
-		/* locking can be disabled */
-		ob->pose->flag &= ~(POSE_DO_UNLOCK|POSE_LOCKED);
+		// XXX todo... figure out way to get appropriate notifiers sent
 		
 		/* do the bone paths */
+#if 0 // TRANSFORM_FIX_ME
 		if (arm->pathflag & ARM_PATH_ACFRA) {
-			//pose_clear_paths(ob);
+			pose_clear_paths(ob);
 			pose_recalculate_paths(ob);
 		}	
+#endif
 	}
 	else {
 		/* tag channels that should have unkeyed data */
@@ -4368,7 +4333,6 @@ void autokeyframe_pose_cb_func(Object *ob, int tmode, short targetless_ik)
 			}
 		}
 	}
-#endif
 }
 
 
@@ -4622,22 +4586,6 @@ void special_aftertrans_update(TransInfo *t)
 			mesh_octree_table(t->obedit, em, NULL, 'e');
 		}
 	}
-#if 0 // TRANSFORM_FIX_ME
-	else if (t->spacetype == SPACE_NLA) {
-		recalc_all_ipos();	// bad
-		synchronize_action_strips();
-		
-		/* cleanup */
-		for (base=t->scene->base.first; base; base=base->next)
-			base->flag &= ~(BA_HAS_RECALC_OB|BA_HAS_RECALC_DATA);
-		
-		/* after transform, remove duplicate keyframes on a frame that resulted from transform */
-		if ( (G.snla->flag & SNLA_NOTRANSKEYCULL)==0 && 
-			 ((cancelled == 0) || (duplicate)) )
-		{
-			posttrans_nla_clean(t);
-		}
-	}
 	else if ((t->flag & T_POSE) && (t->poseobj)) {
 		bArmature *arm;
 		bPose	*pose;
@@ -4648,9 +4596,6 @@ void special_aftertrans_update(TransInfo *t)
 		arm= ob->data;
 		pose= ob->pose;
 		
-		/* this signal does one recalc on pose, then unlocks, so ESC or edit will work */
-		pose->flag |= POSE_DO_UNLOCK;
-		
 		/* if target-less IK grabbing, we calculate the pchan transforms and clear flag */
 		if (!cancelled && t->mode==TFM_TRANSLATION)
 			targetless_ik= apply_targetless_ik(ob);
@@ -4667,7 +4612,7 @@ void special_aftertrans_update(TransInfo *t)
 			
 		/* automatic inserting of keys and unkeyed tagging - only if transform wasn't cancelled (or TFM_DUMMY) */
 		if (!cancelled && (t->mode != TFM_DUMMY)) {
-			autokeyframe_pose_cb_func(ob, t->mode, targetless_ik);
+			autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik);
 			DAG_object_flush_update(t->scene, ob, OB_RECALC_DATA);
 		}
 		else if (arm->flag & ARM_DELAYDEFORM) {
@@ -4678,34 +4623,52 @@ void special_aftertrans_update(TransInfo *t)
 		else 
 			DAG_object_flush_update(t->scene, ob, OB_RECALC_DATA);
 		
-		if (t->mode==TFM_BONESIZE || t->mode==TFM_BONE_ENVELOPE)
-			allqueue(REDRAWBUTSEDIT, 0);
+		//if (t->mode==TFM_BONESIZE || t->mode==TFM_BONE_ENVELOPE)
+		//	allqueue(REDRAWBUTSEDIT, 0);
 		
 	}
+#if 0 // TRANSFORM_FIX_ME
 	else if(G.f & G_PARTICLEEDIT) {
 		;
 	}
-	else {
-		base= FIRSTBASE;
-
-		while (base) {			
-
-			if(base->flag & BA_DO_IPO) redrawipo= 1;
-			
+#endif
+	else { 
+		/* Objects */
+		// XXX ideally, this would go through context iterators, but we don't have context iterator access here,
+		// so we make do with old data + access styles...
+		Scene *scene= t->scene;
+		Base *base;
+		
+		for (base= FIRSTBASE; base; base= base->next) {
 			ob= base->object;
 			
-			if(base->flag & SELECT && (t->mode != TFM_DUMMY)) {
-				if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
+			if (base->flag & SELECT && (t->mode != TFM_DUMMY)) {
+				/* pointcache refresh */
+				if (BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
 					ob->recalc |= OB_RECALC_DATA;
 				
 				/* Set autokey if necessary */
 				if (!cancelled)
-					autokeyframe_ob_cb_func(ob, t->mode);
+					autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode);
 			}
-			
-			base= base->next;
 		}
+	}
+	
+#if 0 // TRANSFORM_FIX_ME
+	else if (t->spacetype == SPACE_NLA) {
+		recalc_all_ipos();	// bad
+		synchronize_action_strips();
 		
+		/* cleanup */
+		for (base=t->scene->base.first; base; base=base->next)
+			base->flag &= ~(BA_HAS_RECALC_OB|BA_HAS_RECALC_DATA);
+		
+		/* after transform, remove duplicate keyframes on a frame that resulted from transform */
+		if ( (G.snla->flag & SNLA_NOTRANSKEYCULL)==0 && 
+			 ((cancelled == 0) || (duplicate)) )
+		{
+			posttrans_nla_clean(t);
+		}
 	}
 #endif
 	

source/blender/editors/transform/transform_generics.c

@@ -86,6 +86,7 @@
 #include "ED_anim_api.h"
 #include "ED_armature.h"
 #include "ED_image.h"
+#include "ED_keyframing.h"
 #include "ED_mesh.h"
 #include "ED_space_api.h"
 #include "ED_uvedit.h"
@@ -560,6 +561,13 @@ void recalcData(TransInfo *t)
 		Object *ob= t->poseobj;
 		bArmature *arm= ob->data;
 		
+		/* if animtimer is running, check if the auto-record feature means that we should record 'samples'
+		 * (i.e. uneditable animation values)
+		 */
+		if (t->animtimer && IS_AUTOKEY_ON(t->scene)) {
+			// XXX
+		}
+		
 		/* old optimize trick... this enforces to bypass the depgraph */
 		if (!(arm->flag & ARM_DELAYDEFORM)) {
 			DAG_object_flush_update(scene, ob, OB_RECALC_DATA);  /* sets recalc flags */