diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-04-17 19:41:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-17 19:41:25 +0300 |
commit | 23c52d9584192e464902b9bbd5097828ddd13dd7 (patch) | |
tree | 76f449aa999fb5b44b79eac5e71c124303d633f6 /release | |
parent | 1f232e9ae99292fc702602de8405ef978fbd5986 (diff) | |
parent | e4915730605568816033a141af28bd27124e3abf (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e1b4e98e09a..bb68eeb4447 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -538,6 +538,7 @@ class SystemPanel: class USERPREF_PT_system_sound(SystemPanel, CenterAlignMixIn, Panel): bl_label = "Sound" + bl_options = {'DEFAULT_CLOSED'} def draw_centered(self, context, layout): prefs = context.preferences @@ -591,20 +592,11 @@ class USERPREF_PT_system_memory(SystemPanel, CenterAlignMixIn, Panel): layout.separator() col = layout.column() - col.prop(system, "memory_cache_limit", text="Sequencer Cache Limit") col.prop(system, "scrollback", text="Console Scrollback Lines") layout.separator() col = layout.column() - col.prop(system, "use_sequencer_disk_cache") - col.prop(system, "sequencer_disk_cache_dir") - col.prop(system, "sequencer_disk_cache_size_limit") - col.prop(system, "sequencer_disk_cache_compression") - - layout.separator() - - col = layout.column() col.prop(system, "texture_time_out", text="Texture Time Out") col.prop(system, "texture_collection_rate", text="Garbage Collection Rate") @@ -615,6 +607,26 @@ class USERPREF_PT_system_memory(SystemPanel, CenterAlignMixIn, Panel): col.prop(system, "vbo_collection_rate", text="Garbage Collection Rate") +class USERPREF_PT_system_video_sequencer(SystemPanel, CenterAlignMixIn, Panel): + bl_label = "Video Sequencer" + + def draw_centered(self, context, layout): + prefs = context.preferences + system = prefs.system + edit = prefs.edit + + layout.prop(system, "memory_cache_limit") + + layout.separator() + + layout.prop(system, "use_sequencer_disk_cache") + col = layout.column() + col.active = system.use_sequencer_disk_cache + col.prop(system, "sequencer_disk_cache_dir", text="Directory") + col.prop(system, "sequencer_disk_cache_size_limit", text="Cache Limit") + col.prop(system, "sequencer_disk_cache_compression", text="Compression") + + # ----------------------------------------------------------------------------- # Viewport Panels @@ -2190,6 +2202,7 @@ classes = ( USERPREF_PT_system_cycles_devices, USERPREF_PT_system_memory, + USERPREF_PT_system_video_sequencer, USERPREF_PT_system_sound, USERPREF_MT_interface_theme_presets, |