diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-08-04 14:36:58 +0300 |
| commit | 5f621a12c6d14d6ec0439992bc0c2590a2bd4760 (patch) | |
| tree | 7143836d4095c1260f4afee06132ffd72ccabcaa /source/blender/editors/sculpt_paint/sculpt.c | |
| parent | ca606bf55165881896467f6a5c09e5870c847fbb (diff) | |
| parent | 701a9d39175e0d3e5e2f776821f1251b8a7a5f78 (diff) | |
Merge branch 'blender-v2.90-release'
Conflicts:
source/blender/editors/gpencil/gpencil_primitive.c
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index a3396a80444..cde4039d20f 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -8947,7 +8947,7 @@ static void SCULPT_OT_mask_by_color(wmOperatorType *ot) "preserve_previous_mask", false, "Preserve Previous Mask", - "Preserve the previous mask and add or substract the new one generated by the colors"); + "Preserve the previous mask and add or subtract the new one generated by the colors"); RNA_def_float(ot->srna, "threshold", |