diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 01:58:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-03 01:58:23 +0300 |
| commit | 9e5577db47c8b9c85d49bec0e0b8050dcae0b513 (patch) | |
| tree | 14828104efc3aeb4c0c845174ab1e3cfdef16635 /source | |
| parent | cbab6a742f7250bcdea40cbf2fdfe18d4119538d (diff) | |
fix [#25015] Ctrl+L linking to scene list does not scroll when the list is larger than screen resolution
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f3d4bea576f..4f36a85dc7a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1313,6 +1313,7 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) ot->idname= "OBJECT_OT_make_links_scene"; /* api callbacks */ + ot->invoke= WM_enum_search_invoke; ot->exec= make_links_scene_exec; /* better not run the poll check */ diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 5f0693dc43c..bf11d131b9c 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -253,6 +253,9 @@ static int sequencer_add_scene_strip_invoke(bContext *C, wmOperator *op, wmEvent return OPERATOR_CANCELLED; } + if(!RNA_property_is_set(op->ptr, "scene")) + return WM_enum_search_invoke(C, op, event); + sequencer_generic_invoke_xy__internal(C, op, event, 0); return sequencer_add_scene_strip_exec(C, op); // needs a menu |