diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 08:33:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-09 08:41:33 +0300 |
| commit | a68c631cf86ebc878ac5b96ef5fb69db15be9161 (patch) | |
| tree | 80508a8291502a07ad999a9f385bdc854be0f22d /source/blender/editors/armature | |
| parent | 8d98362710798fe9e40e6a24c32306e4d4edfef0 (diff) | |
| parent | 817e975dee27640947bf7d083db39d1d70120385 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_select.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index a9acb41fcf6..a6f2fa40f46 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -303,11 +303,11 @@ static EditBone *get_nearest_editbonepoint( ebone_next_act = NULL; } - BLI_rcti_init_pt_size(&rect, mval, 5); + BLI_rcti_init_pt_radius(&rect, mval, 5); hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, true); if (hits == 0) { - BLI_rcti_init_pt_size(&rect, mval, 12); + BLI_rcti_init_pt_radius(&rect, mval, 12); hits = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, true); } /* See if there are any selected bones in this group */ diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index c2813d8c5a7..c3b918ef64f 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -1929,7 +1929,7 @@ static bool sk_selectStroke(bContext *C, SK_Sketch *sketch, const int mval[2], c view3d_set_viewcontext(C, &vc); - BLI_rcti_init_pt_size(&rect, mval, 5); + BLI_rcti_init_pt_radius(&rect, mval, 5); hits = view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect, true); |