From c2e91bcfc4e1ab04d00733e599f22aebc9ccd2eb Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 26 Apr 2017 11:21:53 +0200 Subject: [PATCH] Proper fixup for selection and core That still not ideal, but so be it. IS_VIEWPORT_LEGACY should be removed anyways, this is code from pre-draw manager and the "modern viewport" as well as legacy will go away entirely once the draw manager is feature complete. --- source/blender/editors/space_view3d/view3d_view.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 3314ae27e47..d7eeb6fd1b3 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1202,12 +1202,16 @@ int view3d_opengl_select( if (do_passes) { GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits); +#ifdef WITH_OPENGL_LEGACY if (IS_VIEWPORT_LEGACY(vc->v3d)) { ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); } else { DRW_draw_select_loop(vc, graph, scene, sl, v3d, ar, use_obedit_skip, use_nearest, &rect); } +#else + DRW_draw_select_loop(vc, graph, scene, sl, v3d, ar, use_obedit_skip, use_nearest, &rect); +#endif /* WITH_OPENGL_LEGACY */ GPU_select_end(); }