blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Cleanup: remove underscore prefix from variable 

Avoid using underscore prefix since these typically mean the variable
shouldn't be accessed directly (it may be accessed from a macro,
or memory on the stack which is assigned to a pointer).

In this case a more meaningful name can be used for the argument
that was shadowed.
This commit is contained in:
Campbell Barton 2021-10-27 17:05:02 +11:00
parent 9cb4624296
commit 526e60d4f0
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
View File

@ -220,7 +220,7 @@ static void cage3d_draw_circle_wire(const float r[3],
immUniform2fv("viewportSize", &viewport[2]);
immUniform1f("lineWidth", line_width * U.pixelsize);
imm_draw_cube_wire_3d(pos, (float[3]){0}, r);
imm_draw_cube_wire_3d(pos, (const float[3]){0}, r);
#if 0
if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_TRANSLATE) {

2
source/blender/editors/space_view3d/view3d_cursor_snap.c
View File

@ -372,7 +372,7 @@ static void cursor_box_draw(const float dimensions[3], uchar color[4])
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor4ubv(color);
imm_draw_cube_corners_3d(pos_id, (float[3]){0.0f, 0.0f, dimensions[2]}, dimensions, 0.15f);
imm_draw_cube_corners_3d(pos_id, (const float[3]){0.0f, 0.0f, dimensions[2]}, dimensions, 0.15f);
immUnbindProgram();
GPU_line_smooth(false);

6
source/blender/gpu/GPU_immediate_util.h
View File

@ -78,10 +78,10 @@ void imm_draw_box_checker_2d_ex(float x1,
int checker_size);
void imm_draw_box_checker_2d(float x1, float y1, float x2, float y2);
void imm_draw_cube_fill_3d(uint pos, const float co[3], const float aspect[3]);
void imm_draw_cube_wire_3d(uint pos, const float co[3], const float aspect[3]);
void imm_draw_cube_fill_3d(uint pos, const float center[3], const float aspect[3]);
void imm_draw_cube_wire_3d(uint pos, const float center[3], const float aspect[3]);
void imm_draw_cube_corners_3d(uint pos,
const float co[3],
const float center[3],
const float aspect[3],
const float factor);

30
source/blender/gpu/intern/gpu_immediate_util.c
View File

@ -391,12 +391,12 @@ void imm_draw_box_checker_2d(float x1, float y1, float x2, float y2)
imm_draw_box_checker_2d_ex(x1, y1, x2, y2, checker_primary, checker_secondary, checker_size);
}
void imm_draw_cube_fill_3d(uint pos, const float co[3], const float aspect[3])
void imm_draw_cube_fill_3d(uint pos, const float center[3], const float aspect[3])
{
float coords[ARRAY_SIZE(cube_coords)][3];
for (int i = 0; i < ARRAY_SIZE(cube_coords); i++) {
madd_v3_v3v3v3(coords[i], co, cube_coords[i], aspect);
madd_v3_v3v3v3(coords[i], center, cube_coords[i], aspect);
}
immBegin(GPU_PRIM_TRIS, ARRAY_SIZE(cube_quad_index) * 3 * 2);
@ -412,12 +412,12 @@ void imm_draw_cube_fill_3d(uint pos, const float co[3], const float aspect[3])
immEnd();
}
void imm_draw_cube_wire_3d(uint pos, const float co[3], const float aspect[3])
void imm_draw_cube_wire_3d(uint pos, const float center[3], const float aspect[3])
{
float coords[ARRAY_SIZE(cube_coords)][3];
for (int i = 0; i < ARRAY_SIZE(cube_coords); i++) {
madd_v3_v3v3v3(coords[i], co, cube_coords[i], aspect);
madd_v3_v3v3v3(coords[i], center, cube_coords[i], aspect);
}
immBegin(GPU_PRIM_LINES, ARRAY_SIZE(cube_line_index) * 2);
@ -429,31 +429,31 @@ void imm_draw_cube_wire_3d(uint pos, const float co[3], const float aspect[3])
}
void imm_draw_cube_corners_3d(uint pos,
const float co[3],
const float center[3],
const float aspect[3],
const float factor)
{
float coords[ARRAY_SIZE(cube_coords)][3];
for (int i = 0; i < ARRAY_SIZE(cube_coords); i++) {
madd_v3_v3v3v3(coords[i], co, cube_coords[i], aspect);
madd_v3_v3v3v3(coords[i], center, cube_coords[i], aspect);
}
immBegin(GPU_PRIM_LINES, ARRAY_SIZE(cube_line_index) * 4);
for (int i = 0; i < ARRAY_SIZE(cube_line_index); i++) {
float vec[3], _co[3];
float vec[3], co[3];
sub_v3_v3v3(vec, coords[cube_line_index[i][1]], coords[cube_line_index[i][0]]);
mul_v3_fl(vec, factor);
copy_v3_v3(_co, coords[cube_line_index[i][0]]);
immVertex3fv(pos, _co);
add_v3_v3(_co, vec);
immVertex3fv(pos, _co);
copy_v3_v3(co, coords[cube_line_index[i][0]]);
immVertex3fv(pos, co);
add_v3_v3(co, vec);
immVertex3fv(pos, co);
copy_v3_v3(_co, coords[cube_line_index[i][1]]);
immVertex3fv(pos, _co);
sub_v3_v3(_co, vec);
immVertex3fv(pos, _co);
copy_v3_v3(co, coords[cube_line_index[i][1]]);
immVertex3fv(pos, co);
sub_v3_v3(co, vec);
immVertex3fv(pos, co);
}
immEnd();
}