diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 13:54:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 13:54:02 +0300 |
| commit | 2f8c2572edc27070771c32b235b8012c5dd38f50 (patch) | |
| tree | f5ea72400a0fa91026a8053b4ec13a04b6211feb /source/blender/editors/space_nla/nla_buttons.c | |
| parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) | |
Fix T53632: Objects outside scene shown in popup
Only show objects in current scene when not pinned.
This commit adds a filter argument to id-template
since we may want to filter by other criteria.
Diffstat (limited to 'source/blender/editors/space_nla/nla_buttons.c')
| -rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index c774b99629c..3080ac2de84 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -285,7 +285,9 @@ static void nla_panel_animdata(const bContext *C, Panel *pa) /* Active Action Properties ------------------------------------- */ /* action */ row = uiLayoutRow(layout, true); - uiTemplateID(row, (bContext *)C, &adt_ptr, "action", "ACTION_OT_new", NULL, "NLA_OT_action_unlink"); + uiTemplateID( + row, (bContext *)C, &adt_ptr, "action", + "ACTION_OT_new", NULL, "NLA_OT_action_unlink", UI_TEMPLATE_ID_FILTER_ALL); /* extrapolation */ row = uiLayoutRow(layout, true); |