[Bf-blender-cvs] [795a874d0ba] master: Merge branch 'blender-v2.83-release'

[Bastien Montagne]

Commit: 795a874d0ba84bdb875398e75a7b902f9ebc0880
Author: Bastien Montagne
Date:   Fri Apr 17 15:16:16 2020 +0200
Branches: master
https://developer.blender.org/rB795a874d0ba84bdb875398e75a7b902f9ebc0880

Merge branch 'blender-v2.83-release'

Conflicts:
	source/blender/makesdna/DNA_userdef_types.h
	source/blender/makesrna/intern/rna_userdef.c

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index 2c938ab036f,7a09059e344..622222307c7
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -618,9 -618,10 +618,9 @@@ typedef struct UserDef_FileSpaceData 
  } UserDef_FileSpaceData;
  
  typedef struct UserDef_Experimental {
-   char use_undo_speedup;
+   char use_undo_legacy;
 -  char use_menu_search;
    /** `makesdna` does not allow empty structs. */
 -  char _pad0[6];
 +  char _pad0[7];
  } UserDef_Experimental;
  
  #define USER_EXPERIMENTAL_TEST(userdef, member) \
diff --cc source/blender/makesrna/intern/rna_userdef.c
index 2df2a481091,c08a95d7e16..d1af3ea7910
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -6057,12 -6057,16 +6057,12 @@@ static void rna_def_userdef_experimenta
    RNA_def_struct_clear_flag(srna, STRUCT_UNDO);
    RNA_def_struct_ui_text(srna, "Experimental", "Experimental features");
  
-   prop = RNA_def_property(srna, "use_undo_speedup", PROP_BOOLEAN, PROP_NONE);
-   RNA_def_property_boolean_sdna(prop, NULL, "use_undo_speedup", 1);
+   prop = RNA_def_property(srna, "use_undo_legacy", PROP_BOOLEAN, PROP_NONE);
+   RNA_def_property_boolean_sdna(prop, NULL, "use_undo_legacy", 1);
    RNA_def_property_ui_text(
        prop,
-       "Undo Speedup",
-       "Use new undo speedup (WARNING: can lead to crashes and serious .blend file corruption)");
+       "Undo Legacy",
+       "Use legacy undo (slower than the new default one, but may be more stable in some cases)");
 -
 -  prop = RNA_def_property(srna, "use_menu_search", PROP_BOOLEAN, PROP_NONE);
 -  RNA_def_property_boolean_sdna(prop, NULL, "use_menu_search", 1);
 -  RNA_def_property_ui_text(prop, "Menu Search", "Search actions by menus instead of operators");
  }
  
  static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop)