griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixup for "always use selection in core"

Browse Source 
In my previous commit [1] I forgot one of the if() calls. Handled it
differently now.

[1] dc1f491a50
This commit is contained in:
Dalai Felinto
2017-04-26 11:13:22 +02:00
parent b27775138b
commit 535cf2c714
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
else {
#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);
#endif /* WITH_OPENGL_LEGACY */
else {
ED_view3d_draw_select_loop(vc, scene, sl, v3d, ar, use_obedit_skip, use_nearest);
}
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();