From cd2bb7831d00a810034f0e3cf118b784615d3b4c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 3 Aug 2017 08:01:09 +1000 Subject: Cleanup: rename selectionbase -> select_id --- .../manipulator_library/manipulator_types/arrow3d_manipulator.c | 4 ++-- .../manipulator_library/manipulator_types/dial3d_manipulator.c | 4 ++-- .../manipulator_library/manipulator_types/grab3d_manipulator.c | 4 ++-- .../manipulator_library/manipulator_types/primitive3d_manipulator.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/manipulator_library') 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); } -- cgit v1.2.3