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

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Sergey Sharybin
2024-02-28 15:57:10 +01:00
parent 5c7e4e15ca e3a7d68baf
commit 64427b5344
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/sculpt_paint/paint_mask.cc
View File

@@ -2169,6 +2169,17 @@ static int sculpt_trim_gesture_lasso_invoke(bContext *C, wmOperator *op, const w
return WM_gesture_lasso_invoke(C, op, event);
}
static int project_line_gesture_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
if (!BKE_base_is_visible(v3d, base)) {
return OPERATOR_CANCELLED;
}
return WM_gesture_straightline_active_side_invoke(C, op, event);
}
static int project_gesture_line_exec(bContext *C, wmOperator *op)
{
SculptGestureContext *sgcontext = sculpt_gesture_init_from_line(C, op);
@@ -2330,7 +2341,7 @@ void SCULPT_OT_project_line_gesture(wmOperatorType *ot)
ot->idname = "SCULPT_OT_project_line_gesture";
ot->description = "Project the geometry onto a plane defined by a line";
ot->invoke = WM_gesture_straightline_active_side_invoke;
ot->invoke = project_line_gesture_invoke;
ot->modal = WM_gesture_straightline_oneshot_modal;
ot->exec = project_gesture_line_exec;

6
source/blender/editors/sculpt_paint/sculpt_detail.cc
View File

@@ -97,6 +97,12 @@ static int sculpt_detail_flood_fill_exec(bContext *C, wmOperator *op)
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
if (!BKE_base_is_visible(v3d, base)) {
return OPERATOR_CANCELLED;
}
Vector<PBVHNode *> nodes = bke::pbvh::search_gather(ss->pbvh, {});
if (nodes.is_empty()) {

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

@@ -77,6 +77,12 @@ static int sculpt_set_persistent_base_exec(bContext *C, wmOperator * /*op*/)
Object *ob = CTX_data_active_object(C);
SculptSession *ss = ob->sculpt;
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
if (!BKE_base_is_visible(v3d, base)) {
return OPERATOR_CANCELLED;
}
/* Do not allow in DynTopo just yet. */
if (!ss || (ss && ss->bm)) {
return OPERATOR_FINISHED;