griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove dead StrokeCache variables

Browse Source 
Part of #126672

Both `anchored_location` and `stroke_id` were never read from in any
dependent code. They were only ever written to.

Pull Request: https://projects.blender.org/blender/blender/pulls/126710
This commit is contained in:
Sean Kim
2024-08-24 01:13:54 +02:00
committed by Sean Kim
parent bc43d243bb
commit 47a54b664a
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/sculpt_paint/sculpt.cc
View File

@@ -4412,21 +4412,6 @@ static void brush_delta_update(const Depsgraph &depsgraph,
copy_v3_v3(cache->old_grab_location, grab_location);
if (tool == SCULPT_TOOL_GRAB) {
if (brush.flag & BRUSH_GRAB_ACTIVE_VERTEX) {
copy_v3_v3(cache->anchored_location, cache->orig_grab_location);
}
else {
copy_v3_v3(cache->anchored_location, cache->true_location);
}
}
else if (tool == SCULPT_TOOL_ELASTIC_DEFORM || cloth::is_cloth_deform_brush(brush)) {
copy_v3_v3(cache->anchored_location, cache->true_location);
}
else if (tool == SCULPT_TOOL_THUMB) {
copy_v3_v3(cache->anchored_location, cache->orig_grab_location);
}
if (need_delta_from_anchored_origin(brush)) {
/* Location stays the same for finding vertices in brush radius. */
copy_v3_v3(cache->true_location, cache->orig_grab_location);
@@ -4611,8 +4596,6 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt &sd, Object &ob, Po
cache.radius = paint_calc_object_space_radius(
*cache.vc, cache.true_location, ups.pixel_radius);
cache.radius_squared = cache.radius * cache.radius;
copy_v3_v3(cache.anchored_location, cache.true_location);
}
brush_delta_update(depsgraph, ups, ob, brush);
@@ -4622,7 +4605,6 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt &sd, Object &ob, Po
ups.draw_anchored = true;
copy_v2_v2(ups.anchored_initial_mouse, cache.initial_mouse);
copy_v3_v3(cache.anchored_location, cache.true_location);
ups.anchored_size = ups.pixel_radius;
}
@@ -5445,7 +5427,6 @@ static bool stroke_test_start(bContext *C, wmOperator *op, const float mval[2])
stroke_undo_begin(C, op);
SCULPT_stroke_id_next(ob);
ss.cache->stroke_id = ss.stroke_id;
return true;
}

4
source/blender/editors/sculpt_paint/sculpt_intern.hh
View File

@@ -260,8 +260,6 @@ struct StrokeCache {
*/
bool accum;
float3 anchored_location;
/* Paint Brush. */
struct {
float hardness;
@@ -333,8 +331,6 @@ struct StrokeCache {
rcti previous_r; /* previous redraw rectangle */
rcti current_r; /* current redraw rectangle */
int stroke_id;
~StrokeCache();
};