Merge branch 'blender-v2.83-release'

This commit is contained in:
Antonio Vazquez 2020-04-17 08:25:10 +02:00
commit 841b0c2bf5
1 changed files with 12 additions and 20 deletions

View File

@ -612,34 +612,26 @@ class USERPREF_PT_system_memory(SystemPanel, CenterAlignMixIn, Panel):
layout.separator()
flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(system, "memory_cache_limit", text="Sequencer Cache Limit")
flow.prop(system, "scrollback", text="Console Scrollback Lines")
layout.separator()
flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(system, "use_sequencer_disk_cache")
flow.prop(system, "sequencer_disk_cache_dir")
flow.prop(system, "sequencer_disk_cache_size_limit")
flow.prop(system, "sequencer_disk_cache_compression")
layout.separator()
flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(system, "texture_time_out", text="Texture Time Out")
flow.prop(system, "texture_collection_rate", text="Garbage Collection Rate")
layout.separator()
flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=False)
flow.prop(system, "vbo_time_out", text="Vbo Time Out")
flow.prop(system, "vbo_collection_rate", text="Garbage Collection Rate")
layout.separator()
flow.prop(system, "scrollback", text="Console Scrollback Lines")
layout.separator()
flow.prop(system, "memory_cache_limit", text="Sequencer Cache Limit")
flow.prop(system, "use_sequencer_disk_cache")
flow.prop(system, "sequencer_disk_cache_dir")
flow.prop(system, "sequencer_disk_cache_size_limit")
flow.prop(system, "sequencer_disk_cache_compression")
# -----------------------------------------------------------------------------
# Viewport Panels