diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-01 14:25:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-01 14:27:44 +0300 |
| commit | cbbdb5249f2bb9d10efc56c00c86131d01d6180f (patch) | |
| tree | 7c739d5a3d6ad668337a43aa1786302bb7375df8 /source/blender/editors/space_view3d | |
| parent | e795dd4a20a159bd4e346000e2b6e2fc38eb3b4a (diff) | |
3D View: move particle circle select out of object mode loop
This doesn't support multi-object editing, no reason to check others.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 1d36b5fd79c..7efafea8725 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -3258,8 +3258,9 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) Object *obact = vc.obact; Object *obedit = vc.obedit; - if (obedit || BKE_paint_select_elem_test(obact) || - (obact && (obact->mode & (OB_MODE_PARTICLE_EDIT | OB_MODE_POSE))) ) + if ((obedit != NULL) || + BKE_paint_select_elem_test(obact) || + (obact && (obact->mode & OB_MODE_POSE))) { view3d_operator_needs_opengl(C); @@ -3269,7 +3270,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) obact = vc.obact; obedit = vc.obedit; - if (CTX_data_edit_object(C)) { + if (obedit) { obedit_circle_select(&vc, select, mval, (float)radius); DEG_id_tag_update(obact->data, ID_RECALC_SELECT); WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obact->data); @@ -3284,11 +3285,14 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) pose_circle_select(&vc, select, mval, (float)radius); } else { - return PE_circle_select(C, select, mval, (float)radius); + BLI_assert(0); } } FOREACH_OBJECT_IN_MODE_END; } + else if (obact && (obact->mode & OB_MODE_PARTICLE_EDIT)) { + return PE_circle_select(C, select, mval, (float)radius); + } else if (obact && obact->mode & OB_MODE_SCULPT) { return OPERATOR_CANCELLED; } |