blender/blender
162
515
Fork 780
Code Issues 6.8k Pull Requests 932 Projects 19 Wiki Activity

UI: Sculpt Paint tool defaults #97616 #105759

Closed
Henry-Chang wants to merge 5 commits from Henry-Chang/blender:sculpt-defs-change into main
pull from: Henry-Chang/blender:sculpt-defs-change
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 5 Files Changed 2 +8 -6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/brush.cc
View File

@ -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;

6
source/blender/editors/sculpt_paint/sculpt_filter_color.cc
View File

@ -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);
}