Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-04-20 16:27:27 +0300
committerBastien Montagne <bastien@blender.org>2020-04-20 16:27:27 +0300
commitdcb45992bff2e4ca27a1860b9a34411f23db49a1 (patch)
treea99a7a4454a7af81d1bda3e701dcaee4efc6bef1 /source/blender/makesrna
parentb78f2675d7e573685f6c78e42ca4462d90238e37 (diff)
parentaa2544793dc2a68e6607352059b70136bde6281a (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_ID.c2
-rw-r--r--source/blender/makesrna/intern/rna_gpencil.c2
-rw-r--r--source/blender/makesrna/intern/rna_gpencil_modifier.c2
-rw-r--r--source/blender/makesrna/intern/rna_shader_fx.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 4b9dbbb31b6..891c30af466 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -1520,7 +1520,7 @@ static void rna_def_ID(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Embedded Data",
- "This data-block is not an independant one, but is actually a sub-data of another ID "
+ "This data-block is not an independent one, but is actually a sub-data of another ID "
"(typical example: root node trees or master collections)");
prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index dbc6dcaef39..63fe1cf05ca 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1235,7 +1235,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "uv_translation");
RNA_def_property_array(prop, 2);
RNA_def_property_float_default(prop, 0.0f);
- RNA_def_property_ui_text(prop, "UV Translation", "Translation of default UV postion");
+ RNA_def_property_ui_text(prop, "UV Translation", "Translation of default UV position");
RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_uv_update");
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index bf69fe80638..cb16dae7afa 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -1553,7 +1553,7 @@ static void rna_def_modifier_gpencilarray(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_ARRAY_USE_OB_OFFSET);
- RNA_def_property_ui_text(prop, "Object Offset", "Enable obejct offset");
+ RNA_def_property_ui_text(prop, "Object Offset", "Enable object offset");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index f7f68d535ec..71f767fa93b 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -542,7 +542,7 @@ static void rna_def_shader_fx_glow(BlenderRNA *brna)
prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "blur");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
- RNA_def_property_ui_text(prop, "Size", "Size of th effect");
+ RNA_def_property_ui_text(prop, "Size", "Size of the effect");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);