Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-10-27 07:31:19 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-10-27 07:31:19 +0400
commitaed672ac1e1363b3fd4a7b5cbd415f5eda167306 (patch)
tree31c612ef317c627811a8e9d004c31d259623ef59 /source/blender/editors/space_view3d/view3d_select.c
parent01da2c0e53e8a3faf08375027ced7e7fb153726b (diff)
Border select for sculpting, using B shortcut, warmup for more advanced
masking, like lasso selection.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index ff17c2eedc1..a6ef70a5e33 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -89,6 +89,7 @@
#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_screen.h"
+#include "ED_sculpt.h"
#include "ED_mball.h"
#include "UI_interface.h"
@@ -272,9 +273,6 @@ static int view3d_selectable_data(bContext *C)
}
}
else {
- if (ob->mode & OB_MODE_SCULPT) {
- return 0;
- }
if ((ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)) &&
!paint_facesel_test(ob) && !paint_vertsel_test(ob))
{
@@ -2125,7 +2123,7 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op)
}
else { /* no editmode, unified for bones and objects */
if (vc.obact && vc.obact->mode & OB_MODE_SCULPT) {
- /* pass */
+ ret = do_sculpt_mask_box_select(&vc, &rect, select, extend);
}
else if (vc.obact && paint_facesel_test(vc.obact)) {
ret = do_paintface_box_select(&vc, &rect, select, extend);