diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-08-15 14:02:45 +0300 |
| commit | 3bca9f5fed1f6d3dd485e3cff2174c3394bb1162 (patch) | |
| tree | 7083a56f6b8db22ad51a6319f7281cb4d7124c12 /release | |
| parent | 3311505fd07310a6bfac79ce787dbd394002dd1f (diff) | |
| parent | f20d7bed1426ca3d1268182835f04e7ab8212cac (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/makesrna/intern/rna_render.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 70db35c8c56..e6dbd8c8eab 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -275,6 +275,7 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel): col.separator() col.prop(rd, "preview_start_resolution") + col.prop(rd, "preview_pixel_size", text="") col = split.column() col.label(text="Memory:") |