Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 0605ea30806..7dc4a72e510 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1673,8 +1673,8 @@ static int selectbuffer_ret_hits_15(uint *UNUSED(buffer), const int hits15)
static int selectbuffer_ret_hits_9(uint *buffer, const int hits15, const int hits9)
{
- const int offs = 4 * hits15;
- memcpy(buffer, buffer + offs, 4 * hits9 * sizeof(uint));
+ const int ofs = 4 * hits15;
+ memcpy(buffer, buffer + ofs, 4 * hits9 * sizeof(uint));
return hits9;
}
@@ -1683,8 +1683,8 @@ static int selectbuffer_ret_hits_5(uint *buffer,
const int hits9,
const int hits5)
{
- const int offs = 4 * hits15 + 4 * hits9;
- memcpy(buffer, buffer + offs, 4 * hits5 * sizeof(uint));
+ const int ofs = 4 * hits15 + 4 * hits9;
+ memcpy(buffer, buffer + ofs, 4 * hits5 * sizeof(uint));
return hits5;
}
@@ -1726,30 +1726,30 @@ static int mixed_bones_object_selectbuffer(ViewContext *vc,
goto finally;
}
else if (hits15 > 0) {
- int offs;
+ int ofs;
has_bones15 = selectbuffer_has_bones(buffer, hits15);
- offs = 4 * hits15;
+ ofs = 4 * hits15;
BLI_rcti_init_pt_radius(&rect, mval, 9);
hits9 = view3d_opengl_select(
- vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode, select_filter);
+ vc, buffer + ofs, MAXPICKBUF - ofs, &rect, select_mode, select_filter);
if (hits9 == 1) {
hits = selectbuffer_ret_hits_9(buffer, hits15, hits9);
goto finally;
}
else if (hits9 > 0) {
- has_bones9 = selectbuffer_has_bones(buffer + offs, hits9);
+ has_bones9 = selectbuffer_has_bones(buffer + ofs, hits9);
- offs += 4 * hits9;
+ ofs += 4 * hits9;
BLI_rcti_init_pt_radius(&rect, mval, 5);
hits5 = view3d_opengl_select(
- vc, buffer + offs, MAXPICKBUF - offs, &rect, select_mode, select_filter);
+ vc, buffer + ofs, MAXPICKBUF - ofs, &rect, select_mode, select_filter);
if (hits5 == 1) {
hits = selectbuffer_ret_hits_5(buffer, hits15, hits9, hits5);
goto finally;
}
else if (hits5 > 0) {
- has_bones5 = selectbuffer_has_bones(buffer + offs, hits5);
+ has_bones5 = selectbuffer_has_bones(buffer + ofs, hits5);
}
}