diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 22:37:36 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 22:37:36 +0300 |
| commit | 4948b6e226bb0352e0a6ead7dadddc33bb43c908 (patch) | |
| tree | 8b6286cacc944e26b979d8fb3f9b46578b22fe91 /release/scripts/startup/bl_ui | |
| parent | feff6b4df3bd156b2939c1b1bf79759bf479c368 (diff) | |
| parent | 0c4d949effa88f2ad54297a865fb2763f61c61aa (diff) | |
Merge remote-tracking branch 'origin/master' into pbr-merge
Conflicts:
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'release/scripts/startup/bl_ui')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index bf6df05c2b2..b6087184518 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -687,6 +687,12 @@ class IMAGE_PT_view_properties(Panel): sub.active = uvedit.show_stretch sub.row().prop(uvedit, "draw_stretch_type", expand=True) + col = layout.column() + col.prop(uvedit, "show_other_objects") + row = col.row() + row.active = uvedit.show_other_objects + row.prop(uvedit, "other_uv_filter", text="Filter") + if show_render and ima: layout.separator() render_slot = ima.render_slots.active |