diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-06 15:00:46 +0300 |
| commit | a5cba9aab9a2ade00caefc1a7697f8fbd3f7304f (patch) | |
| tree | b34138ac968663a47cdd2b09a26ea68aeeba2377 /source/blender/editors/armature/armature_select.c | |
| parent | dc9a7f861fa43fecae7450ee254a711b061c0c26 (diff) | |
| parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/blender/editors/armature/armature_select.c')
| -rw-r--r-- | source/blender/editors/armature/armature_select.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 4634213fb54..a9acb41fcf6 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -303,17 +303,11 @@ static EditBone *get_nearest_editbonepoint( ebone_next_act = NULL; } - rect.xmin = mval[0] - 5; - rect.xmax = mval[0] + 5; - rect.ymin = mval[1] - 5; - rect.ymax = mval[1] + 5; + BLI_rcti_init_pt_size(&rect, mval, 5); hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, true); if (hits == 0) { - rect.xmin = mval[0] - 12; - rect.xmax = mval[0] + 12; - rect.ymin = mval[1] - 12; - rect.ymax = mval[1] + 12; + BLI_rcti_init_pt_size(&rect, mval, 12); hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, true); } /* See if there are any selected bones in this group */ |