Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-12-10 05:37:31 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-12-10 05:37:31 +0400
commitec3b5d5205cee92d0fd10a617cfd8f95be416fc7 (patch)
tree7ad5cd7e5b2347d91936f71181c2459bd7891ad9 /source/blender/editors/animation
parent4aeed148d18c98caed6c29773874fae8e8c094e8 (diff)
fix for copying markers to other scenes not working with 10 or more scenes. Regression from r34115.
Diffstat (limited to 'source/blender/editors/animation')
-rw-r--r--source/blender/editors/animation/anim_markers.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 62ffdc7fd3a..1b980790fdc 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -1409,6 +1409,11 @@ static int ed_marker_make_links_scene_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
+static int ed_marker_make_links_scene_invoke_wrapper(bContext *C, wmOperator *op, wmEvent *evt)
+{
+ return ed_markers_opwrap_invoke_custom(C, op, evt, WM_menu_invoke);
+}
+
static void MARKER_OT_make_links_scene(wmOperatorType *ot)
{
PropertyRNA *prop;
@@ -1420,7 +1425,7 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot)
/* api callbacks */
ot->exec = ed_marker_make_links_scene_exec;
- ot->invoke = ed_markers_opwrap_invoke;
+ ot->invoke = ed_marker_make_links_scene_invoke_wrapper;
ot->poll = ed_markers_poll_selected_markers;
/* flags */