diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-16 17:18:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-16 18:16:42 +0300 |
| commit | ece72e15d5789bcb5e9a140131768863d724cff4 (patch) | |
| tree | 9f6b7885312be62fb0640dbf65f2bae844f1b24f /source/blender/windowmanager/gizmo | |
| parent | 49562da98d81a0a3d2a4c94b1138be9272587c91 (diff) | |
Preferences: remove OpenGL select method preference.
Deprecated GL_SELECT no longer works in OpenGL core profile, so there is no
reason to have this.
Diffstat (limited to 'source/blender/windowmanager/gizmo')
| -rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index 48e5ac5a072..68c736404e8 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -520,22 +520,18 @@ static int gizmo_find_intersected_3d_intern( /* Almost certainly overkill, but allow for many custom gizmos. */ GLuint buffer[MAXPICKBUF]; short hits; - const bool do_passes = GPU_select_query_check_active(); BLI_rcti_init_pt_radius(&rect, co, hotspot); ED_view3d_draw_setup_view(CTX_wm_window(C), CTX_data_depsgraph(C), CTX_data_scene(C), ar, v3d, NULL, NULL, &rect); - if (do_passes) - GPU_select_begin(buffer, ARRAY_SIZE(buffer), &rect, GPU_SELECT_NEAREST_FIRST_PASS, 0); - else - GPU_select_begin(buffer, ARRAY_SIZE(buffer), &rect, GPU_SELECT_ALL, 0); + GPU_select_begin(buffer, ARRAY_SIZE(buffer), &rect, GPU_SELECT_NEAREST_FIRST_PASS, 0); /* do the drawing */ gizmo_draw_select_3D_loop(C, visible_gizmos, gz_stop); hits = GPU_select_end(); - if (do_passes && (hits > 0)) { + if (hits > 0) { GPU_select_begin(buffer, ARRAY_SIZE(buffer), &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits); gizmo_draw_select_3D_loop(C, visible_gizmos, gz_stop); GPU_select_end(); |