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_image | |
| 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_image')
| -rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 51ccaf6800a..20f9658020d 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -871,8 +871,11 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char uiLayoutSetContextPointer(layout, "edit_image", &imaptr); uiLayoutSetContextPointer(layout, "edit_image_user", userptr); - if (!compact) - uiTemplateID(layout, C, ptr, propname, ima ? NULL : "IMAGE_OT_new", "IMAGE_OT_open", NULL); + if (!compact) { + uiTemplateID( + layout, C, ptr, propname, + ima ? NULL : "IMAGE_OT_new", "IMAGE_OT_open", NULL, UI_TEMPLATE_ID_FILTER_ALL); + } if (ima) { UI_block_funcN_set(block, rna_update_cb, MEM_dupallocN(cb), NULL); |