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:
authorCampbell Barton <ideasman42@gmail.com>2019-03-05 14:26:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-03-05 14:26:45 +0300
commit8d8d113b7379b96d8cd9440f4e1f87524a418fef (patch)
treeecc4ac8f59c846918fd280db82ee87dc15c92e4d /source/blender/editors/space_view3d/view3d_select.c
parent0ae6747300a74daf14482f9ca89caffa9e503454 (diff)
Tool System: use set/add/subtract for all circle select operators
This applies changes from the 3D view circle select to other operators.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index e14d0a5ff3f..161b4e67c77 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -3351,17 +3351,12 @@ static bool object_circle_select(ViewContext *vc, const eSelectOp sel_op, const
static int view3d_circle_select_exec(bContext *C, wmOperator *op)
{
ViewContext vc;
- const bool is_first = (op->customdata && (((wmGesture *)op->customdata)->is_active_prev == false));
const int radius = RNA_int_get(op->ptr, "radius");
- eSelectOp sel_op = RNA_enum_get(op->ptr, "mode");
const int mval[2] = {RNA_int_get(op->ptr, "x"),
RNA_int_get(op->ptr, "y")};
- if (is_first == false) {
- if (sel_op == SEL_OP_SET) {
- sel_op = SEL_OP_ADD;
- }
- }
+ const eSelectOp sel_op = ED_select_op_modal(
+ RNA_enum_get(op->ptr, "mode"), WM_gesture_is_modal_first(op->customdata));
ED_view3d_viewcontext_init(C, &vc);