diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
| commit | 189c2e9277d4abd3b750a5a60ef42549dcfe359d (patch) | |
| tree | 1430a845f4aab56b9133c3d8c6ffac09ee6dd92a /release/scripts/startup/bl_ui/space_userpref.py | |
| parent | 771bad9c6abaad4b742935e5d55067f281287650 (diff) | |
| parent | 1519b6a23e0341e25bf5a5c714f9f3d119ab8781 (diff) | |
Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_context
Diffstat (limited to 'release/scripts/startup/bl_ui/space_userpref.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 999e41e17f7..dc18dd73abc 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -383,6 +383,11 @@ class USERPREF_PT_system(Panel): col = colsplit.column() col.label(text="General:") col.prop(system, "dpi") + col.label("Virtual Pixel Mode:") + col.prop(system, "virtual_pixel_mode", text="") + + col.separator() + col.prop(system, "frame_server_port") col.prop(system, "scrollback", text="Console Scrollback") @@ -424,7 +429,6 @@ class USERPREF_PT_system(Panel): col.prop(system, "use_gpu_mipmap") col.prop(system, "use_16bit_textures") - if system.is_occlusion_query_supported(): col.separator() col.label(text="Selection") |