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_filter_color.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_filter_color.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_filter_color.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c index 878a08ceeb7..912dfd808b0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c @@ -322,6 +322,6 @@ void SCULPT_OT_color_filter(struct wmOperatorType *ot) ot->srna, "strength", 1.0f, -10.0f, 10.0f, "Strength", "Filter Strength", -10.0f, 10.0f); PropertyRNA *prop = RNA_def_float_color( - ot->srna, "fill_color", 3, NULL, 0.0f, FLT_MAX, "Fill Color", "fill color", 0.0f, 1.0f); + ot->srna, "fill_color", 3, NULL, 0.0f, FLT_MAX, "Fill Color", "", 0.0f, 1.0f); RNA_def_property_subtype(prop, PROP_COLOR_GAMMA); } |