blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Sculpt: Add Transform, Trim, and Mesh Filter operators to Sculpt menu #104718

Merged
Joseph Eagar merged 19 commits from Tarek-Yasser/blender:sculpt_mode_add_menu_operators into main 2023-03-08 01:18:34 +01:00
Conversation 25 Commits 19 Files Changed 9 +6 -5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76a7387276 - Show all commits

1
scripts/presets/keyconfig/keymap_data/blender_default.py
View File

@ -6326,6 +6326,7 @@ def km_sculpt_mesh_filter_modal_map(_params):
items.extend([
("CONFIRM", {"type": 'LEFTMOUSE', "value": 'PRESS', "any": True}, None),
("CONFIRM", {"type": 'LEFTMOUSE', "value": 'RELEASE', "any": True}, None),
("CONFIRM", {"type": 'RET', "value": 'RELEASE', "any": True}, None),
("CONFIRM", {"type": 'NUMPAD_ENTER', "value": 'RELEASE', "any": True}, None),

10
source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc
View File

@ -849,7 +849,7 @@ static void sculpt_mesh_filter_end(bContext *C)
SculptSession *ss = ob->sculpt;
SCULPT_filter_cache_free(ss);
SCULPT_undo_push_end(ob);
SCULPT_undo_push_end_ex(ob, true);
SCULPT_flush_update_done(C, ob, SCULPT_UPDATE_COORDS);
}
@ -895,6 +895,7 @@ static void sculpt_mesh_filter_cancel(bContext *C, wmOperator * /*op*/)
BKE_pbvh_node_mark_update(node);
}
MEM_SAFE_FREE(nodes);
BKE_pbvh_update_bounds(ss->pbvh, PBVH_UpdateBB);
}
@ -911,7 +912,6 @@ static int sculpt_mesh_filter_modal(bContext *C, wmOperator *op, const wmEvent *
if (event->type == EVT_MODAL_MAP) {
int ret = FILTER_MESH_MODAL_CONFIRM;
switch (event->val) {
case FILTER_MESH_MODAL_CANCEL:
sculpt_mesh_filter_cancel(C, op);
ret = OPERATOR_CANCELLED;
@ -926,7 +926,7 @@ static int sculpt_mesh_filter_modal(bContext *C, wmOperator *op, const wmEvent *
}
sculpt_mesh_filter_end(C);
ED_workspace_status_text(C, NULL); // Clear status bar
ED_workspace_status_text(C, nullptr); /* Clear status bar */
WM_cursor_modal_restore(CTX_wm_window(C));
return ret;
@ -1171,8 +1171,8 @@ void SCULPT_OT_mesh_filter(wmOperatorType *ot)
ot->exec = sculpt_mesh_filter_exec;
ot->ui = sculpt_mesh_ui_exec;
// Doesn't seem to actually be called?
// Check `sculpt_mesh_filter_modal` to see where it's really called.
/* Doesn't seem to actually be called?
Joseph Eagar commented 2023-02-27 11:51:08 +01:00
Review
Copy Link

Don't use // comments.

Don't use // comments.
Check `sculpt_mesh_filter_modal` to see where it's really called. */
ot->cancel = sculpt_mesh_filter_cancel;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_GRAB_CURSOR_X | OPTYPE_BLOCKING | OPTYPE_DEPENDS_ON_CURSOR;