From 2bc89982dc285e37042976c367560196d4ecee8b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 29 Jul 2023 13:47:53 +1000 Subject: [PATCH] Cleanup: remove unused variable --- source/blender/editors/sculpt_paint/sculpt_dyntopo.cc | 11 ++++------- source/blender/editors/sculpt_paint/sculpt_intern.hh | 5 +---- source/blender/editors/sculpt_paint/sculpt_ops.cc | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 52a2162e15e..8f93075f787 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -77,7 +77,7 @@ void SCULPT_pbvh_clear(Object *ob) DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); } -void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *ob) +void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Object *ob) { SculptSession *ss = ob->sculpt; Mesh *me = static_cast(ob->data); @@ -226,10 +226,7 @@ void sculpt_dynamic_topology_disable_with_undo(Main *bmain, } } -static void sculpt_dynamic_topology_enable_with_undo(Main *bmain, - Depsgraph *depsgraph, - Scene *scene, - Object *ob) +static void sculpt_dynamic_topology_enable_with_undo(Main *bmain, Depsgraph *depsgraph, Object *ob) { SculptSession *ss = ob->sculpt; if (ss->bm == nullptr) { @@ -238,7 +235,7 @@ static void sculpt_dynamic_topology_enable_with_undo(Main *bmain, if (use_undo) { SCULPT_undo_push_begin_ex(ob, "Dynamic topology enable"); } - SCULPT_dynamic_topology_enable_ex(bmain, depsgraph, scene, ob); + SCULPT_dynamic_topology_enable_ex(bmain, depsgraph, ob); if (use_undo) { SCULPT_undo_push_node(ob, nullptr, SCULPT_UNDO_DYNTOPO_BEGIN); SCULPT_undo_push_end(ob); @@ -260,7 +257,7 @@ static int sculpt_dynamic_topology_toggle_exec(bContext *C, wmOperator * /*op*/) sculpt_dynamic_topology_disable_with_undo(bmain, depsgraph, scene, ob); } else { - sculpt_dynamic_topology_enable_with_undo(bmain, depsgraph, scene, ob); + sculpt_dynamic_topology_enable_with_undo(bmain, depsgraph, ob); } WM_cursor_wait(false); diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh index 481c288e2d1..f871f44c15c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh @@ -1356,10 +1356,7 @@ enum eDynTopoWarnFlag { ENUM_OPERATORS(eDynTopoWarnFlag, DYNTOPO_WARN_MODIFIER); /** Enable dynamic topology; mesh will be triangulated */ -void SCULPT_dynamic_topology_enable_ex(Main *bmain, - Depsgraph *depsgraph, - Scene *scene, - Object *ob); +void SCULPT_dynamic_topology_enable_ex(Main *bmain, Depsgraph *depsgraph, Object *ob); void SCULPT_dynamic_topology_disable(bContext *C, SculptUndoNode *unode); void sculpt_dynamic_topology_disable_with_undo(Main *bmain, Depsgraph *depsgraph, diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index d51dc9a87d0..a7f8c035583 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -406,7 +406,7 @@ void ED_object_sculptmode_enter_ex(Main *bmain, if (has_undo) { SCULPT_undo_push_begin_ex(ob, "Dynamic topology enable"); } - SCULPT_dynamic_topology_enable_ex(bmain, depsgraph, scene, ob); + SCULPT_dynamic_topology_enable_ex(bmain, depsgraph, ob); if (has_undo) { SCULPT_undo_push_node(ob, nullptr, SCULPT_UNDO_DYNTOPO_BEGIN); SCULPT_undo_push_end(ob);