diff options
author | Bastien Montagne <bastien@blender.org> | 2022-05-09 13:45:16 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-05-09 13:45:16 +0300 |
commit | b508999d8d9715155ed0f5a5c8b1a23d1e21c46d (patch) | |
tree | 2d534315153d1bc32d50d53ea216818befe2d56e /source | |
parent | 4ac6177b8d676d9e678126af71067cad3674ff3b (diff) | |
parent | b1b699412979ff7a3f2a48f95f9c3c1d131ba46a (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 9298eb83b46..469169cf4cc 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -136,7 +136,7 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) ot->srna, "overlap_shuffle_override", false, - "Override Overlap Shuffle Behaviour", + "Override Overlap Shuffle Behavior", "Use the overlap_mode tool settings to determine how to shuffle overlapping strips"); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index b65e08311fe..b0488bbfa7a 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -1976,7 +1976,7 @@ static void rna_def_ID(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Extra User", - "Indicates wether an extra user is set or not (mainly for internal/debug usages)"); + "Indicates whether an extra user is set or not (mainly for internal/debug usages)"); RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_extra_user_set"); prop = RNA_def_property(srna, "is_embedded_data", PROP_BOOLEAN, PROP_NONE); |