blender
/
blender
137
415
Fork 597
Code Issues 6.3k Pull Requests 769 Projects 19 Wiki Activity

Fix brush defaults bug

This commit is contained in:
Joseph Eagar 2021-09-22 19:05:27 -07:00
parent 36d5b6e959
commit 7e220dc3f0
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
release/scripts/startup/bl_ui/properties_paint_common.py
View File

@ -822,11 +822,31 @@ def brush_settings(layout, context, brush, popover=False):
)
box.prop(brush, "use_custom_topology_rake_spacing", text="Custom Spacing")
if brush.use_custom_topology_rake_spacing:
box.prop(brush, "topology_rake_spacing", text="Spacing")
box.prop(brush, "topology_rake_projection")
if brush.channels.channels["topology_rake_use_spacing"].bool_value:
UnifiedPaintPanel.prop_unified(
box,
context,
brush,
"topology_rake_spacing",
slider=True,
text="Spacing"
)
UnifiedPaintPanel.prop_unified(
box,
context,
brush,
"topology_rake_projection",
slider=True
)
UnifiedPaintPanel.prop_unified(
box,
context,
brush,
"topology_rake_radius_scale",
slider=True
)
box.prop(brush, "topology_rake_radius_factor", slider=True)
box.prop(brush, "use_curvature_rake")
box.prop(brush, "ignore_falloff_for_topology_rake")

15
source/blender/blenkernel/intern/brush.c
View File

@ -1799,17 +1799,18 @@ void BKE_brush_sculpt_reset(Brush *br)
* settings used by a brush: */
// BKE_brush_debug_print_state(br);
BKE_brush_builtin_create(br, br->sculpt_tool);
if (br->channels) {
BrushChannel *ch;
BrushChannel *ch;
for (ch = (BrushChannel *)br->channels->channels.first; ch; ch = ch->next) {
BrushChannelType *def = ch->def;
for (ch = (BrushChannel *)br->channels->channels.first; ch; ch = ch->next) {
BrushChannelType *def = ch->def;
BKE_brush_channel_free_data(ch);
BKE_brush_channel_init(ch, def);
BKE_brush_channel_free_data(ch);
BKE_brush_channel_init(ch, def);
}
}
BKE_brush_builtin_create(br, br->sculpt_tool);
BKE_brush_channelset_ui_init(br, br->sculpt_tool);
brush_defaults(br);

2
source/blender/blenkernel/intern/brush_channel_define.h
View File

@ -113,7 +113,7 @@ places in rna_engine_codebase are relevent:
"used for DynTopo", 1.0f, 0.001f, 5.0f, 0.01f, 2.0f, false)
MAKE_FLOAT_EX(projection, "Projection", "Amount of volume preserving projection", 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, false)
MAKE_FLOAT_EX(autosmooth_projection, "Projection", "Amount of volume preserving projection", 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, false)
MAKE_FLOAT_EX(topology_rake_projection, "Projection", "Amount of volume preserving projection", 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, false)
MAKE_FLOAT_EX(topology_rake_projection, "Projection", "Amount of volume preserving projection", 0.975f, 0.0f, 1.0f, 0.0f, 1.0f, false)
MAKE_FLOAT(fset_slide, "Face Set Projection", "Stick face set boundaries to surface of mesh", 1.0f, 0.0f, 1.0f)
MAKE_FLOAT(boundary_smooth, "Boundary Smooth", "Smooth hard boundaries", 0.0f, 0.0f, 1.0f)
MAKE_BOOL(topology_rake_use_spacing, "Use Spacing", "Use custom spacing for topology rake", false)

1
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -8462,6 +8462,7 @@ void do_brush_action(Sculpt *sd, Object *ob, Brush *brush, UnifiedPaintSettings
SCULPT_TOOL_CREASE,
SCULPT_TOOL_CLOTH,
SCULPT_TOOL_SIMPLIFY,
SCULPT_TOOL_SNAKE_HOOK,
SCULPT_TOOL_PAINT,
SCULPT_TOOL_SMEAR)) {