diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-26 12:13:22 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-26 12:13:22 +0300 |
| commit | 535cf2c71409893748c21d00a7da32907fe54622 (patch) | |
| tree | 4371165e3cb105d3908e643f107aa4ea15ccec98 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | b27775138beedb20405756d5bbce01173b16fb74 (diff) | |
Fixup for "always use selection in core"
In my previous commit [1] I forgot one of the if() calls. Handled it
differently now.
[1] dc1f491a506deafbd80f13b20783e477ef5f99fd
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 3314ae27e47..28ff1231b25 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1185,16 +1185,15 @@ int view3d_opengl_select( GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0); -#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); +#ifndef WITH_OPENGL_LEGACY + if (!IS_VIEWPORT_LEGACY(vc->v3d)) +#endif + { + 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); + 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); -#endif /* WITH_OPENGL_LEGACY */ hits = GPU_select_end(); @@ -1202,11 +1201,14 @@ int view3d_opengl_select( if (do_passes) { GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits); - if (IS_VIEWPORT_LEGACY(vc->v3d)) { - ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); +#ifndef WITH_OPENGL_LEGACY + if (!IS_VIEWPORT_LEGACY(vc->v3d)) +#endif + { + 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); + ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest); } GPU_select_end(); |