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

Cleanup: remove unused variable

Browse Source
This commit is contained in:
Campbell Barton
2023-07-29 13:47:53 +10:00
parent 22206a1592
commit 2bc89982dc
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/sculpt_paint/sculpt_dyntopo.cc
View File

@@ -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<Mesh *>(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);

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

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

2
source/blender/editors/sculpt_paint/sculpt_ops.cc
View File

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