blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Revert "Fixup for "always use selection in core"" 

This reverts commit 535cf2c714.
This commit is contained in:
Dalai Felinto 2017-04-26 11:19:15 +02:00
parent 535cf2c714
commit 8b4941b7c5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/space_view3d/view3d_view.c
View File

@ -1185,15 +1185,16 @@ int view3d_opengl_select(
GPU_select_begin(buffer, bufsize, &rect, gpu_select_mode, 0);
#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 {
#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 */
hits = GPU_select_end();
@ -1201,14 +1202,11 @@ int view3d_opengl_select(
if (do_passes) {
GPU_select_begin(buffer, bufsize, &rect, GPU_SELECT_NEAREST_SECOND_PASS, hits);
#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);
if (IS_VIEWPORT_LEGACY(vc->v3d)) {
ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest);
}
else {
ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest);
DRW_draw_select_loop(vc, graph, scene, sl, v3d, ar, use_obedit_skip, use_nearest, &rect);
}
GPU_select_end();