[Bf-blender-cvs] [cd2bb7831d0] blender2.8: Cleanup: rename selectionbase -> select_id

[Campbell Barton]

Commit: cd2bb7831d00a810034f0e3cf118b784615d3b4c
Author: Campbell Barton
Date:   Thu Aug 3 08:01:09 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBcd2bb7831d00a810034f0e3cf118b784615d3b4c

Cleanup: rename selectionbase -> select_id

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

M	source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
M	source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
M	source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
M	source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
M	source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c

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

diff --git a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
index dffecd70407..03357bc48f0 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
@@ -220,9 +220,9 @@ static void arrow_draw_intern(ArrowManipulator3D *arrow, const bool select, cons
 
 static void manipulator_arrow_draw_select(
         const bContext *UNUSED(C), wmManipulator *mpr,
-        int selectionbase)
+        int select_id)
 {
-	GPU_select_load_id(selectionbase);
+	GPU_select_load_id(select_id);
 	arrow_draw_intern((ArrowManipulator3D *)mpr, true, false);
 }
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
index 7ecb38373e5..5007c2614bc 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -327,7 +327,7 @@ static void dial_draw_intern(
 	gpuPopMatrix();
 }
 
-static void manipulator_dial_draw_select(const bContext *C, wmManipulator *mpr, int selectionbase)
+static void manipulator_dial_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
 {
 	float clip_plane_buf[4];
 	const int draw_options = RNA_enum_get(mpr->ptr, "draw_options");
@@ -343,7 +343,7 @@ static void manipulator_dial_draw_select(const bContext *C, wmManipulator *mpr,
 		glEnable(GL_CLIP_DISTANCE0);
 	}
 
-	GPU_select_load_id(selectionbase);
+	GPU_select_load_id(select_id);
 	dial_draw_intern(C, mpr, true, false, clip_plane);
 
 	if (clip_plane) {
diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
index 20969970802..152595eea38 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
@@ -170,9 +170,9 @@ static void grab3d_draw_intern(
 	}
 }
 
-static void manipulator_grab_draw_select(const bContext *C, wmManipulator *mpr, int selectionbase)
+static void manipulator_grab_draw_select(const bContext *C, wmManipulator *mpr, int select_id)
 {
-	GPU_select_load_id(selectionbase);
+	GPU_select_load_id(select_id);
 	grab3d_draw_intern(C, mpr, true, false);
 }
 
diff --git a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
index 7d66b82ac95..3eeaaedafc8 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
@@ -133,9 +133,9 @@ static void manipulator_primitive_draw_intern(
 
 static void manipulator_primitive_draw_select(
         const bContext *UNUSED(C), wmManipulator *mpr,
-        int selectionbase)
+        int select_id)
 {
-	GPU_select_load_id(selectionbase);
+	GPU_select_load_id(select_id);
 	manipulator_primitive_draw_intern(mpr, true, false);
 }
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
index 298a2b30c9e..54034333782 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
@@ -416,7 +416,7 @@ void WM_manipulatormap_draw(
 
 static void manipulator_draw_select_3D_loop(const bContext *C, ListBase *visible_manipulators)
 {
-	int selectionbase = 0;
+	int select_id = 0;
 	wmManipulator *mpr;
 
 	/* TODO(campbell): this depends on depth buffer being written to, currently broken for the 3D view. */
@@ -441,10 +441,10 @@ static void manipulator_draw_select_3D_loop(const bContext *C, ListBase *visible
 
 		/* pass the selection id shifted by 8 bits. Last 8 bits are used for selected manipulator part id */
 
-		mpr->type->draw_select(C, mpr, selectionbase << 8);
+		mpr->type->draw_select(C, mpr, select_id << 8);
 
 
-		selectionbase++;
+		select_id++;
 	}
 
 	if (is_depth_prev) {