griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename selectionbase -> select_id

Browse Source
This commit is contained in:
Campbell Barton
2017-08-03 08:01:09 +10:00
parent ca67cdb73c
commit cd2bb7831d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
View File

@@ -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);
}

4
source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
View File

@@ -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) {

4
source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
View File

@@ -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);
}

4
source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
View File

@@ -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);
}

6
source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
View File

@@ -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) {