blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Sculpt: fix, disable border/circle/mouse select operators in sculpt mode.

This commit is contained in:
Brecht Van Lommel 2010-01-04 17:03:44 +00:00
parent 5dd7b4d490
commit 0e37b49a2c
Notes: blender-bot 2023-02-14 11:07:27 +01:00 
Referenced by issue #38814, Sculpt Mode Ctrl + Right Click Shortcut absent
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_view3d/view3d_select.c
View File

@ -1424,6 +1424,8 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
else if(obedit==NULL && (obact && obact->mode & OB_MODE_PARTICLE_EDIT)) {
return PE_border_select(C, &rect, selecting, extend);
}
else if(obedit==NULL && (obact && obact->mode & OB_MODE_SCULPT))
return OPERATOR_CANCELLED;
if(obedit) {
if(obedit->type==OB_MESH) {
@ -1689,6 +1691,8 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
retval = mouse_mball(C, event->mval, extend);
}
else if(obact && obact->mode & OB_MODE_SCULPT)
return OPERATOR_CANCELLED;
else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT)
return PE_mouse_particles(C, event->mval, extend);
else if(obact && paint_facesel_test(obact))
@ -2012,6 +2016,9 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op)
else
return PE_circle_select(C, selecting, mval, (float)radius);
}
else if(obact && obact->mode & OB_MODE_SCULPT) {
return OPERATOR_CANCELLED;
}
else {
Base *base;
selecting= selecting?BA_SELECT:BA_DESELECT;