diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-28 05:11:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-28 05:11:17 +0300 |
commit | c0d6627dc5fd069ec31c116e98e1817a0fe20ebb (patch) | |
tree | 3917fd81f0d7924da0e9099984f0558ff06bc788 /source/blender/editors/space_view3d/view3d_select.c | |
parent | c9a292793011cc813f20bcae0225a13cc82bdea4 (diff) | |
parent | 8a7eb6c4c1677cca8349ac250cd8f3c8ccdbd385 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 2862ebd9b2f..2e6ffb63b78 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1101,7 +1101,7 @@ static Base *object_mouse_select_menu( } } -static bool selectbuffer_has_bones(const unsigned int *buffer, const unsigned int hits) +static bool selectbuffer_has_bones(const uint *buffer, const uint hits) { unsigned int i; for (i = 0; i < hits; i++) { @@ -1222,8 +1222,9 @@ finally: } /* returns basact */ -static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, - Base *startbase, bool has_bones, bool do_nearest) +static Base *mouse_select_eval_buffer( + ViewContext *vc, const uint *buffer, int hits, + Base *startbase, bool has_bones, bool do_nearest) { ViewLayer *view_layer = vc->view_layer; Base *base, *basact = NULL; |