Merge branch 'blender-v2.83-release'

Conflicts: source/blender/makesdna/DNA_userdef_types.h source/blender/makesrna/intern/rna_userdef.c
2020-04-17 15:16:16 +02:00
parent c87dd76937 c565d0764f
commit 795a874d0b
8 changed files with 17 additions and 9 deletions
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -2157,7 +2157,7 @@ class USERPREF_PT_experimental_system(ExperimentalPanel, Panel):
    def draw(self, context):
        self._draw_items(
            context, (
-                ({"property": "use_undo_speedup"}, "T60695"),
+                ({"property": "use_undo_legacy"}, "T60695"),
            ),
        )