diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-04-17 16:16:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-04-17 16:16:16 +0300 |
| commit | 795a874d0ba84bdb875398e75a7b902f9ebc0880 (patch) | |
| tree | 78bc372cb0a7598a3d5f4699119ca921542dd505 /source/blender/makesrna/intern/rna_userdef.c | |
| parent | c87dd76937f026c4a154dc4073063959f3e5a87e (diff) | |
| parent | c565d0764f75ba5a5bb51d5daa9152897db59eb8 (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 2df2a481091..d1af3ea7910 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -6057,12 +6057,12 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) 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)"); } static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop) |