[Bf-blender-cvs] [23c52d95841] master: Merge branch 'blender-v2.83-release'

[Brecht Van Lommel]

Commit: 23c52d9584192e464902b9bbd5097828ddd13dd7
Author: Brecht Van Lommel
Date:   Fri Apr 17 18:41:25 2020 +0200
Branches: master
https://developer.blender.org/rB23c52d9584192e464902b9bbd5097828ddd13dd7

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index e1b4e98e09a,3d579053a97..bb68eeb4447
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -590,31 -611,39 +591,42 @@@ class USERPREF_PT_system_memory(SystemP
  
          layout.separator()
  
 -        layout.prop(system, "texture_time_out", text="Texture Time Out")
 -        layout.prop(system, "texture_collection_rate", text="Garbage Collection Rate")
 +        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()
- 
 -        layout.prop(system, "vbo_time_out", text="Vbo Time Out")
 -        layout.prop(system, "vbo_collection_rate", text="Garbage Collection Rate")
 +        col = layout.column()
 +        col.prop(system, "texture_time_out", text="Texture Time Out")
 +        col.prop(system, "texture_collection_rate", text="Garbage Collection Rate")
  
          layout.separator()
  
 -        layout.prop(system, "scrollback", text="Console Scrollback Lines")
 +        col = layout.column()
 +        col.prop(system, "vbo_time_out", text="Vbo Time Out")
 +        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