diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index eb783ed4abc..c32cd1ea64d 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -1865,17 +1865,17 @@ void BKE_brush_sculpt_reset(Brush *br) case SCULPT_TOOL_PAINT: br->hardness = 0.4f; br->spacing = 10; - br->alpha = 0.6f; + br->alpha = 1.0f; br->flow = 1.0f; br->tip_scale_x = 1.0f; br->tip_roundness = 1.0f; br->density = 1.0f; br->flag &= ~BRUSH_SPACE_ATTEN; - copy_v3_fl(br->rgb, 1.0f); - zero_v3(br->secondary_rgb); + zero_v3(br->rgb); + copy_v3_fl(br->secondary_rgb, 1.0f); break; case SCULPT_TOOL_SMEAR: - br->alpha = 1.0f; + br->alpha = 0.6f; br->spacing = 5; br->flag &= ~BRUSH_ALPHA_PRESSURE; br->flag &= ~BRUSH_SPACE_ATTEN; diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index bdf42b895cf..b080377bc23 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -50,6 +50,8 @@ enum eSculptColorFilterTypes { COLOR_FILTER_SMOOTH, }; +static const float fill_filter_default_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + static EnumPropertyItem prop_color_filter_types[] = { {COLOR_FILTER_FILL, "FILL", 0, "Fill", "Fill with a specific color"}, {COLOR_FILTER_HUE, "HUE", 0, "Hue", "Change hue"}, @@ -466,9 +468,9 @@ void SCULPT_OT_color_filter(wmOperatorType *ot) /* rna */ SCULPT_mesh_filter_properties(ot); - RNA_def_enum(ot->srna, "type", prop_color_filter_types, COLOR_FILTER_HUE, "Filter Type", ""); + RNA_def_enum(ot->srna, "type", prop_color_filter_types, COLOR_FILTER_FILL, "Filter Type", ""); PropertyRNA *prop = RNA_def_float_color( - ot->srna, "fill_color", 3, nullptr, 0.0f, FLT_MAX, "Fill Color", "", 0.0f, 1.0f); + ot->srna, "fill_color", 3, fill_filter_default_color, 0.0f, FLT_MAX, "Fill Color", "", 0.0f, 1.0f); RNA_def_property_subtype(prop, PROP_COLOR_GAMMA); }