[Bf-blender-cvs] [8b4941b7c55] blender2.8: Revert "Fixup for "always use selection in core""

[Dalai Felinto]

Commit: 8b4941b7c55823e6c20bfe7d30043817e151f61e
Author: Dalai Felinto
Date:   Wed Apr 26 11:19:15 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB8b4941b7c55823e6c20bfe7d30043817e151f61e

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

This reverts commit 535cf2c71409893748c21d00a7da32907fe54622.

===================================================================

M	source/blender/editors/space_view3d/view3d_view.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 28ff1231b25..3314ae27e47 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -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);
+#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 {
-		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);
 	}
+#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();