Revision: 35365
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35365
Author: ton
Date: 2011-03-05 14:03:29 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Bugfix #26317
Dopesheet: shift+d duplicate is now a macro too, allowing a single undo.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_api/spacetypes.c
Modified: trunk/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_anim_api.h 2011-03-05
11:08:22 UTC (rev 35364)
+++ trunk/blender/source/blender/editors/include/ED_anim_api.h 2011-03-05
14:03:29 UTC (rev 35365)
@@ -588,8 +588,9 @@
/* space_graph */
void ED_operatormacros_graph(void);
+ /* space_action */
+void ED_operatormacros_action(void);
-
/* ************************************************ */
#endif /* ED_ANIM_API_H */
Modified: trunk/blender/source/blender/editors/space_action/action_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_edit.c
2011-03-05 11:08:22 UTC (rev 35364)
+++ trunk/blender/source/blender/editors/space_action/action_edit.c
2011-03-05 14:03:29 UTC (rev 35365)
@@ -663,9 +663,6 @@
{
actkeys_duplicate_exec(C, op);
- RNA_int_set(op->ptr, "mode", TFM_TIME_DUPLICATE);
- WM_operator_name_call(C, "TRANSFORM_OT_transform",
WM_OP_INVOKE_REGION_WIN, op->ptr);
-
return OPERATOR_FINISHED;
}
Modified: trunk/blender/source/blender/editors/space_action/action_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_ops.c
2011-03-05 11:08:22 UTC (rev 35364)
+++ trunk/blender/source/blender/editors/space_action/action_ops.c
2011-03-05 14:03:29 UTC (rev 35365)
@@ -88,6 +88,18 @@
WM_operatortype_append(ACTION_OT_markers_make_local);
}
+void ED_operatormacros_action(void)
+{
+ wmOperatorType *ot;
+ wmOperatorTypeMacro *otmacro;
+
+ ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move",
"Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
+ WM_operatortype_macro_define(ot, "ACTION_OT_duplicate");
+ otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform");
+ RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+
+}
+
/* ************************** registration - keymaps
**********************************/
static void action_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap)
@@ -159,7 +171,7 @@
WM_keymap_add_item(keymap, "ACTION_OT_delete", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ACTION_OT_delete", DELKEY, KM_PRESS, 0, 0);
- WM_keymap_add_item(keymap, "ACTION_OT_duplicate", DKEY, KM_PRESS,
KM_SHIFT, 0);
+ WM_keymap_add_item(keymap, "ACTION_OT_duplicate_move", DKEY, KM_PRESS,
KM_SHIFT, 0);
WM_keymap_add_item(keymap, "ACTION_OT_keyframe_insert", IKEY, KM_PRESS,
0, 0);
/* copy/paste */
Modified: trunk/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- trunk/blender/source/blender/editors/space_api/spacetypes.c 2011-03-05
11:08:22 UTC (rev 35364)
+++ trunk/blender/source/blender/editors/space_api/spacetypes.c 2011-03-05
14:03:29 UTC (rev 35365)
@@ -128,6 +128,7 @@
ED_operatormacros_object();
ED_operatormacros_file();
ED_operatormacros_graph();
+ ED_operatormacros_action();
/* register dropboxes (can use macros) */
spacetypes = BKE_spacetypes_list();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
