[Bf-blender-cvs] [7821bac08d6] blender2.8: Manipulator: remove unused draw step

[Campbell Barton]

Commit: 7821bac08d6faaac05f2b491825c61a7f74ce1d5
Author: Campbell Barton
Date:   Fri Aug 4 09:35:07 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB7821bac08d6faaac05f2b491825c61a7f74ce1d5

Manipulator: remove unused draw step

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

M	source/blender/windowmanager/manipulators/WM_manipulator_types.h
M	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c

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

diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
index 52b3c5d85dd..ba23a7ece3a 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -367,14 +367,11 @@ typedef struct wmManipulatorGroup {
  * Pass a value of this enum to #WM_manipulatormap_draw to tell it what to draw.
  */
 typedef enum eWM_ManipulatorMapDrawStep {
-	/* Draw 2D manipulator-groups (ManipulatorGroupType.is_3d == false) */
+	/** Draw 2D manipulator-groups (#WM_MANIPULATORGROUPTYPE_3D not set). */
 	WM_MANIPULATORMAP_DRAWSTEP_2D = 0,
-	/* Draw 3D manipulator-groups (ManipulatorGroupType.is_3d == true) */
+	/** Draw 3D manipulator-groups (#WM_MANIPULATORGROUPTYPE_3D set). */
 	WM_MANIPULATORMAP_DRAWSTEP_3D,
-	/* Draw only depth culled manipulators (WM_MANIPULATOR_SCENE_DEPTH flag).
-	 * Note that these are expected to be 3D manipulators too. */
-	WM_MANIPULATORMAP_DRAWSTEP_IN_SCENE,
 } eWM_ManipulatorMapDrawStep;
-#define WM_MANIPULATORMAP_DRAWSTEP_MAX 3
+#define WM_MANIPULATORMAP_DRAWSTEP_MAX 2
 
 #endif  /* __WM_MANIPULATOR_TYPES_H__ */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 5ddd82c6e15..7dd696caf39 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -208,8 +208,6 @@ bool wm_manipulatorgroup_is_visible_in_drawstep(
 			return (mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D) == 0;
 		case WM_MANIPULATORMAP_DRAWSTEP_3D:
 			return (mgroup->type->flag & WM_MANIPULATORGROUPTYPE_3D);
-		case WM_MANIPULATORMAP_DRAWSTEP_IN_SCENE:
-			return (mgroup->type->flag & WM_MANIPULATORGROUPTYPE_DEPTH_3D);
 		default:
 			BLI_assert(0);
 			return false;