diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 19:10:06 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-09 19:10:06 +0300 |
| commit | 8a6d055f3734c8a0bfeb9b6256d25bfb414634e6 (patch) | |
| tree | 17ec0b453d351f56d3a3511b9d50773f1fc8271f /source/blender/editors/armature/armature_select.c | |
| parent | 528cb8877f3c8923752a016854682722708c47a0 (diff) | |
| parent | 6c942db30dee14eb37229879656fa049a9ac6df6 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/armature_select.c')
| -rw-r--r-- | source/blender/editors/armature/armature_select.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index 1b2b70cd60d..b78adba408c 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -53,8 +53,6 @@ #include "ED_screen.h" #include "ED_view3d.h" -#include "GPU_select.h" - #include "armature_intern.h" /* utility macros for storing a temp int in the bone (selection flag) */ @@ -343,7 +341,7 @@ static EditBone *get_nearest_editbonepoint( int hits = 0; /* we _must_ end cache before return, use 'goto cache_end' */ - GPU_select_cache_begin(); + view3d_opengl_select_cache_begin(); BLI_rcti_init_pt_radius(&rect, mval, 12); hits12 = view3d_opengl_select(vc, buffer, MAXPICKBUF, &rect, select_mode); @@ -368,7 +366,7 @@ static EditBone *get_nearest_editbonepoint( } cache_end: - GPU_select_cache_end(); + view3d_opengl_select_cache_end(); /* See if there are any selected bones in this group */ if (hits > 0) { |