[Bf-blender-cvs] [49fa58e3309] blender2.8: Gizmo: fix extrude handles

[Campbell Barton]

Commit: 49fa58e3309f7f980f2bfe184ceef541a9bfdfaf
Author: Campbell Barton
Date:   Fri Sep 7 16:36:02 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB49fa58e3309f7f980f2bfe184ceef541a9bfdfaf

Gizmo: fix extrude handles

Only use the 2D selection function when 3D selection isn't defined.

Regression from e18a2c4ed7b

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

M	source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c

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

diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
index 973addc506d..583130a0099 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
@@ -569,7 +569,8 @@ static wmGizmo *gizmo_find_intersected_3d(
 		int select_id = 0;
 		for (LinkData *link = visible_gizmos->first; link; link = link->next, select_id++) {
 			wmGizmo *gz = link->data;
-			if (gz->type->test_select) {
+			/* With both defined, favor the 3D, incase the manipulator can be used in 2D or 3D views. */
+			if (gz->type->test_select && (gz->type->draw_select == NULL)) {
 				if ((*r_part = gz->type->test_select(C, gz, co)) != -1) {
 					hit = select_id;
 					result = gz;