blender
/
blender
135
398
Fork 579
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Disable dyntopo toggle if multires modifier in stack #107652

Closed
Angus Stanton wants to merge 2 commits from ab_stanton/blender:multires-disable-dyntopo into main
pull from: ab_stanton/blender:multires-disable-dyntopo
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 2 Files Changed 1 +22 -1
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,27 @@ static void sculpt_dynamic_topology_enable_with_undo(Main *bmain,
}
}
static bool sculpt_dynamic_topology_toggle_poll(bContext *C)
{
if (!SCULPT_mode_poll(C)) {
return false;
}
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
if (ss->bm) {
return true;
}
if (BKE_modifiers_uses_multires(ob)) {
CTX_wm_operator_poll_msg_set(
C, "Dyntopo cannot be used with a Multires modifier in the modifier stack");
return false;
}
return true;
}
static int sculpt_dynamic_topology_toggle_exec(bContext *C, wmOperator * /*op*/)
{
Main *bmain = CTX_data_main(C);
@ -407,7 +428,7 @@ void SCULPT_OT_dynamic_topology_toggle(wmOperatorType *ot)
/* API callbacks. */
ot->invoke = sculpt_dynamic_topology_toggle_invoke;
ot->exec = sculpt_dynamic_topology_toggle_exec;
ot->poll = SCULPT_mode_poll;
ot->poll = sculpt_dynamic_topology_toggle_poll;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}