dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Remove unused sculpt brush reset function

Browse Source 
This isn't in use anymore since brush assets were merged, they have
their own resetting logic.
This commit is contained in:
Julian Eisel
2024-09-27 18:35:50 +02:00
parent 05a398cf45
commit 0a2a8d612a
2 changed files with 0 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/BKE_brush.hh
-2
View File
@@ -52,8 +52,6 @@ void BKE_brush_init_curves_sculpt_settings(Brush *brush);
Brush *BKE_brush_first_search(Main *bmain, eObjectMode ob_mode);
void BKE_brush_sculpt_reset(Brush *brush);
void BKE_brush_jitter_pos(const Scene &scene,
const Brush &brush,
const float pos[2],
source/blender/blenkernel/intern/brush.cc
-257
View File
@@ -732,263 +732,6 @@ void BKE_brush_debug_print_state(Brush *br)
#undef BR_TEST_FLAG
}
void BKE_brush_sculpt_reset(Brush *br)
{
/* enable this to see any non-default
* settings used by a brush: */
// BKE_brush_debug_print_state(br);
brush_defaults(br);
BKE_brush_curve_preset(br, CURVE_PRESET_SMOOTH);
/* Use the curve presets by default */
br->curve_preset = BRUSH_CURVE_SMOOTH;
/* Note that sculpt defaults where set when 0.5 was the default (now it's 1.0)
* assign this so logic below can remain the same. */
br->alpha = 0.5f;
/* Brush settings */
switch (br->sculpt_brush_type) {
case SCULPT_BRUSH_TYPE_DRAW_SHARP:
br->flag |= BRUSH_DIR_IN;
br->curve_preset = BRUSH_CURVE_POW4;
br->spacing = 5;
break;
case SCULPT_BRUSH_TYPE_DISPLACEMENT_ERASER:
br->curve_preset = BRUSH_CURVE_SMOOTHER;
br->spacing = 10;
br->alpha = 1.0f;
break;
case SCULPT_BRUSH_TYPE_SLIDE_RELAX:
br->spacing = 10;
br->alpha = 1.0f;
br->slide_deform_type = BRUSH_SLIDE_DEFORM_DRAG;
break;
case SCULPT_BRUSH_TYPE_CLAY:
br->flag |= BRUSH_SIZE_PRESSURE;
br->spacing = 3;
br->autosmooth_factor = 0.25f;
br->normal_radius_factor = 0.75f;
br->hardness = 0.65f;
break;
case SCULPT_BRUSH_TYPE_CLAY_THUMB:
br->alpha = 0.5f;
br->normal_radius_factor = 1.0f;
br->spacing = 6;
br->hardness = 0.5f;
br->flag |= BRUSH_SIZE_PRESSURE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_CLAY_STRIPS:
br->flag |= BRUSH_ACCUMULATE | BRUSH_SIZE_PRESSURE;
br->flag &= ~BRUSH_SPACE_ATTEN;
br->alpha = 0.6f;
br->spacing = 5;
br->normal_radius_factor = 1.55f;
br->tip_roundness = 0.18f;
br->curve_preset = BRUSH_CURVE_SMOOTHER;
break;
case SCULPT_BRUSH_TYPE_MULTIPLANE_SCRAPE:
br->flag2 |= BRUSH_MULTIPLANE_SCRAPE_DYNAMIC | BRUSH_MULTIPLANE_SCRAPE_PLANES_PREVIEW;
br->alpha = 0.7f;
br->normal_radius_factor = 0.70f;
br->multiplane_scrape_angle = 60;
br->curve_preset = BRUSH_CURVE_SMOOTH;
br->spacing = 5;
break;
case SCULPT_BRUSH_TYPE_CREASE:
br->flag |= BRUSH_DIR_IN;
br->alpha = 0.25;
break;
case SCULPT_BRUSH_TYPE_SCRAPE:
case SCULPT_BRUSH_TYPE_FILL:
br->alpha = 0.7f;
br->area_radius_factor = 0.5f;
br->spacing = 7;
br->flag |= BRUSH_ACCUMULATE;
br->flag |= BRUSH_INVERT_TO_SCRAPE_FILL;
break;
case SCULPT_BRUSH_TYPE_ROTATE:
br->alpha = 1.0;
break;
case SCULPT_BRUSH_TYPE_SMOOTH:
br->flag &= ~BRUSH_SPACE_ATTEN;
br->spacing = 5;
br->alpha = 0.7f;
br->surface_smooth_shape_preservation = 0.5f;
br->surface_smooth_current_vertex = 0.5f;
br->surface_smooth_iterations = 4;
break;
case SCULPT_BRUSH_TYPE_SNAKE_HOOK:
br->alpha = 1.0f;
br->rake_factor = 1.0f;
break;
case SCULPT_BRUSH_TYPE_THUMB:
br->size = 75;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_ELASTIC_DEFORM:
br->elastic_deform_volume_preservation = 0.4f;
br->elastic_deform_type = BRUSH_ELASTIC_DEFORM_GRAB_TRISCALE;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_POSE:
br->pose_smooth_iterations = 4;
br->pose_ik_segments = 1;
br->flag2 |= BRUSH_POSE_IK_ANCHORED | BRUSH_USE_CONNECTED_ONLY;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_BOUNDARY:
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
br->curve_preset = BRUSH_CURVE_CONSTANT;
break;
case SCULPT_BRUSH_TYPE_DRAW_FACE_SETS:
br->alpha = 0.5f;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_GRAB:
br->alpha = 0.4f;
br->size = 75;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
break;
case SCULPT_BRUSH_TYPE_CLOTH:
br->cloth_mass = 1.0f;
br->cloth_damping = 0.01f;
br->cloth_sim_limit = 2.5f;
br->cloth_sim_falloff = 0.75f;
br->cloth_deform_type = BRUSH_CLOTH_DEFORM_DRAG;
br->flag &= ~(BRUSH_ALPHA_PRESSURE | BRUSH_SIZE_PRESSURE);
break;
case SCULPT_BRUSH_TYPE_LAYER:
br->flag &= ~BRUSH_SPACE_ATTEN;
br->hardness = 0.35f;
br->alpha = 1.0f;
br->height = 0.05f;
break;
case SCULPT_BRUSH_TYPE_PAINT:
br->hardness = 0.4f;
br->spacing = 10;
br->alpha = 1.0f;
br->flow = 1.0f;
br->density = 1.0f;
br->flag &= ~BRUSH_SPACE_ATTEN;
zero_v3(br->rgb);
copy_v3_fl(br->secondary_rgb, 1.0f);
break;
case SCULPT_BRUSH_TYPE_SMEAR:
br->alpha = 0.6f;
br->spacing = 5;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE_ATTEN;
br->curve_preset = BRUSH_CURVE_SPHERE;
break;
case SCULPT_BRUSH_TYPE_DISPLACEMENT_SMEAR:
br->alpha = 1.0f;
br->spacing = 5;
br->hardness = 0.7f;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE_ATTEN;
br->curve_preset = BRUSH_CURVE_SMOOTHER;
break;
default:
break;
}
/* Cursor colors */
/* Default Alpha */
br->add_col[3] = 0.90f;
br->sub_col[3] = 0.90f;
switch (br->sculpt_brush_type) {
case SCULPT_BRUSH_TYPE_DRAW:
case SCULPT_BRUSH_TYPE_DRAW_SHARP:
case SCULPT_BRUSH_TYPE_CLAY:
case SCULPT_BRUSH_TYPE_CLAY_STRIPS:
case SCULPT_BRUSH_TYPE_CLAY_THUMB:
case SCULPT_BRUSH_TYPE_LAYER:
case SCULPT_BRUSH_TYPE_INFLATE:
case SCULPT_BRUSH_TYPE_BLOB:
case SCULPT_BRUSH_TYPE_CREASE:
br->add_col[0] = 0.0f;
br->add_col[1] = 0.5f;
br->add_col[2] = 1.0f;
br->sub_col[0] = 0.0f;
br->sub_col[1] = 0.5f;
br->sub_col[2] = 1.0f;
break;
case SCULPT_BRUSH_TYPE_SMOOTH:
case SCULPT_BRUSH_TYPE_FLATTEN:
case SCULPT_BRUSH_TYPE_FILL:
case SCULPT_BRUSH_TYPE_SCRAPE:
case SCULPT_BRUSH_TYPE_MULTIPLANE_SCRAPE:
br->add_col[0] = 0.877f;
br->add_col[1] = 0.142f;
br->add_col[2] = 0.117f;
br->sub_col[0] = 0.877f;
br->sub_col[1] = 0.142f;
br->sub_col[2] = 0.117f;
break;
case SCULPT_BRUSH_TYPE_PINCH:
case SCULPT_BRUSH_TYPE_GRAB:
case SCULPT_BRUSH_TYPE_SNAKE_HOOK:
case SCULPT_BRUSH_TYPE_THUMB:
case SCULPT_BRUSH_TYPE_NUDGE:
case SCULPT_BRUSH_TYPE_ROTATE:
case SCULPT_BRUSH_TYPE_ELASTIC_DEFORM:
case SCULPT_BRUSH_TYPE_POSE:
case SCULPT_BRUSH_TYPE_BOUNDARY:
case SCULPT_BRUSH_TYPE_SLIDE_RELAX:
br->add_col[0] = 1.0f;
br->add_col[1] = 0.95f;
br->add_col[2] = 0.005f;
br->sub_col[0] = 1.0f;
br->sub_col[1] = 0.95f;
br->sub_col[2] = 0.005f;
break;
case SCULPT_BRUSH_TYPE_SIMPLIFY:
case SCULPT_BRUSH_TYPE_PAINT:
case SCULPT_BRUSH_TYPE_MASK:
case SCULPT_BRUSH_TYPE_DRAW_FACE_SETS:
case SCULPT_BRUSH_TYPE_DISPLACEMENT_ERASER:
case SCULPT_BRUSH_TYPE_DISPLACEMENT_SMEAR:
br->add_col[0] = 0.75f;
br->add_col[1] = 0.75f;
br->add_col[2] = 0.75f;
br->sub_col[0] = 0.75f;
br->sub_col[1] = 0.75f;
br->sub_col[2] = 0.75f;
break;
case SCULPT_BRUSH_TYPE_CLOTH:
br->add_col[0] = 1.0f;
br->add_col[1] = 0.5f;
br->add_col[2] = 0.1f;
br->sub_col[0] = 1.0f;
br->sub_col[1] = 0.5f;
br->sub_col[2] = 0.1f;
break;
default:
break;
}
}
void BKE_brush_curve_preset(Brush *b, eCurveMappingPreset preset)
{
CurveMapping *cumap = nullptr;