2.5 - Action Editor Transforms now work again

Note: there were some crashes that would occur if context was not reset everytime the modal callback was run. Probably there's something about the context info we need to be more careful about.

1 files changed, 7 insertions, 2 deletions

diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c
index cd9be252fa8..d09a08af0b6 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -46,6 +46,8 @@
 #include "UI_interface.h"
 #include "UI_view2d.h"
 
+#include "BIF_transform.h"
+
 #include "action_intern.h"
 
 #include "RNA_access.h"
@@ -82,7 +84,7 @@ void action_operatortypes(void)
 
 /* ************************** registration - keymaps **********************************/
 
-static void action_keymap_keyframes (ListBase *keymap)
+static void action_keymap_keyframes (wmWindowManager *wm, ListBase *keymap)
 {
 	/* action_select.c - selection tools */
 		/* click-select */
@@ -124,6 +126,9 @@ static void action_keymap_keyframes (ListBase *keymap)
 	
 	WM_keymap_add_item(keymap, "ACT_OT_keyframes_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "ACT_OT_keyframes_delete", DELKEY, KM_PRESS, 0, 0);
+	
+	/* transform system */
+	transform_keymap_for_space(wm, keymap, SPACE_ACTION);
 }
 
 /* --------------- */
@@ -137,6 +142,6 @@ void action_keymap(wmWindowManager *wm)
 	
 	/* keyframes */
 	keymap= WM_keymap_listbase(wm, "Action_Keys", SPACE_ACTION, 0);
-	action_keymap_keyframes(keymap);
+	action_keymap_keyframes(wm, keymap);
 }