diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-06-08 06:40:14 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2020-06-08 06:40:14 +0300 |
commit | 917ab4fbf99b4d431ef4b7c357eefdcec562ce85 (patch) | |
tree | 0b0f64a87a1ae25a3e25148c56d1fddd9f02ea76 /source/blender | |
parent | c175ff19d8c0deeb358cf6d67165416330a529d2 (diff) |
UI: use term 'Merge Distance' instead of 'Merge Limit'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index b4ae9c96ba7..2c050cba6b7 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -7533,7 +7533,7 @@ static void SCULPT_OT_symmetrize(wmOperatorType *ot) 0.001f, 0.0f, FLT_MAX, - "Merge Limit", + "Merge Distance", "Distance within which symmetrical vertices are merged", 0.0f, 1.0f); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d4aeae2cfe0..1fa89806ce9 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2193,7 +2193,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna) RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_ui_range(prop, 0, 1, 0.01, 6); RNA_def_property_ui_text( - prop, "Merge Limit", "Distance within which mirrored vertices are merged"); + prop, "Merge Distance", "Distance within which mirrored vertices are merged"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "mirror_object", PROP_POINTER, PROP_NONE); |