diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-11-12 13:39:34 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-11-12 13:39:34 +0300 |
commit | 0d04bcd566a8ec62591621a908076f417b717b3d (patch) | |
tree | a814dca90f772b67aeab3683e961da82f9c77bc9 /source | |
parent | d706aaa53dc16ff542cad11c55b4c94cc2f52371 (diff) | |
parent | 12dd26a2bbb37fc369956d9e2bcd7d851aafafde (diff) |
Merge branch 'blender-v2.91-release' into master
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/mesh/editmesh_mask_extract.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_detail.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_face_set.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index 8ef1f9ee176..be9314ad2fd 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -408,7 +408,7 @@ static int face_set_extract_modal(bContext *C, wmOperator *op, const wmEvent *ev return geometry_extract_apply(C, op, geometry_extract_tag_face_set, ¶ms); } break; - + case EVT_ESCKEY: case RIGHTMOUSE: { WM_cursor_modal_restore(CTX_wm_window(C)); ED_workspace_status_text(C, NULL); diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.c b/source/blender/editors/sculpt_paint/sculpt_detail.c index cdfcdbc4660..ddf5b39f080 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.c +++ b/source/blender/editors/sculpt_paint/sculpt_detail.c @@ -329,7 +329,7 @@ static int sculpt_sample_detail_size_modal(bContext *C, wmOperator *op, const wm return OPERATOR_FINISHED; } break; - + case EVT_ESCKEY: case RIGHTMOUSE: { WM_cursor_modal_restore(CTX_wm_window(C)); ED_workspace_status_text(C, NULL); diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c index f803bccde43..c05dace380a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.c +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c @@ -110,7 +110,10 @@ int ED_sculpt_face_sets_active_update_and_get(bContext *C, Object *ob, const flo } SculptCursorGeometryInfo gi; - SCULPT_cursor_geometry_info_update(C, &gi, mval, false); + if (!SCULPT_cursor_geometry_info_update(C, &gi, mval, false)) { + return SCULPT_FACE_SET_NONE; + } + return SCULPT_active_face_set_get(ss); } |