diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-04 20:03:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-04 20:03:44 +0300 |
| commit | 0e37b49a2c2f3693db834295262b2f041799c542 (patch) | |
| tree | f77dc96e923141d82b755dc7ce8552c0bb2fddca | |
| parent | 5dd7b4d4907c11315654cd788ce24fa7faaa5231 (diff) | |
Sculpt: fix, disable border/circle/mouse select operators in sculpt mode.
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 17af631350a..0ed7f4c0d0a 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -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; |