[Bf-blender-cvs] [ff6098345a6] master: Cleanup: Clang tidy, unused variable warnings
Hans Goudey
noreply at git.blender.org
Fri Apr 22 19:41:31 CEST 2022
Commit: ff6098345a6e0fca508d0e104976d54ca199f273
Author: Hans Goudey
Date: Fri Apr 22 12:41:25 2022 -0500
Branches: master
https://developer.blender.org/rBff6098345a6e0fca508d0e104976d54ca199f273
Cleanup: Clang tidy, unused variable warnings
Also remove unnecessary uses of `struct` and add const in one place.
===================================================================
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/intern/draw_volume.cc
M source/blender/editors/sculpt_paint/paint_vertex.cc
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index fa93faf1606..e5006c2672c 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -922,6 +922,7 @@ static void math_layer_info_init(BevelParams *bp, BMesh *bm)
}
}
BLI_assert(top_face != NULL && bot_face != NULL);
+ UNUSED_VARS_NDEBUG(top_face, bot_face);
swap_face_components(face_component, totface, face_component[0], top_face_component);
if (bot_face_component != top_face_component) {
if (bot_face_component == 0) {
@@ -4910,8 +4911,7 @@ static float projected_boundary_area(BevVert *bv, BMFace *f)
*/
static bool is_bad_uv_poly(BevVert *bv, BMFace *frep)
{
- VMesh *vm = bv->vmesh;
- BLI_assert(vm != NULL);
+ BLI_assert(bv->vmesh != NULL);
float area = projected_boundary_area(bv, frep);
return area < BEVEL_EPSILON_BIG;
}
@@ -5326,7 +5326,7 @@ static BMEdge *snap_edge_for_center_vmesh_vert(int i,
if (frep_beats_next[previ] && bndv_rep_faces[previ] == center_frep) {
return eprev;
}
- else if (!frep_beats_next[i] && bndv_rep_faces[nexti] == center_frep) {
+ if (!frep_beats_next[i] && bndv_rep_faces[nexti] == center_frep) {
return enext;
}
/* If n_bndv > 3 then we won't snap in the boundvert regions
diff --git a/source/blender/draw/intern/draw_volume.cc b/source/blender/draw/intern/draw_volume.cc
index e268e28fa27..8d9a6f486e2 100644
--- a/source/blender/draw/intern/draw_volume.cc
+++ b/source/blender/draw/intern/draw_volume.cc
@@ -67,7 +67,7 @@ void DRW_volume_ubos_pool_free(void *pool)
delete reinterpret_cast<VolumeUniformBufPool *>(pool);
}
-static void drw_volume_globals_init(void)
+static void drw_volume_globals_init()
{
const float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f};
const float one[4] = {1.0f, 1.0f, 1.0f, 1.0f};
@@ -132,17 +132,17 @@ static DRWShadingGroup *drw_volume_object_grids_init(Object *ob,
int grid_id = 0;
LISTBASE_FOREACH (GPUMaterialAttribute *, attr, attrs) {
const VolumeGrid *volume_grid = BKE_volume_grid_find_for_read(volume, attr->name);
- DRWVolumeGrid *drw_grid = (volume_grid) ?
- DRW_volume_batch_cache_get_grid(volume, volume_grid) :
- NULL;
+ const DRWVolumeGrid *drw_grid = (volume_grid) ?
+ DRW_volume_batch_cache_get_grid(volume, volume_grid) :
+ nullptr;
/* Handle 3 cases here:
* - Grid exists and texture was loaded -> use texture.
* - Grid exists but has zero size or failed to load -> use zero.
* - Grid does not exist -> use default value. */
- GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
- (volume_grid) ? g_data.dummy_zero :
- grid_default_texture(attr->default_value);
+ const GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
+ (volume_grid) ? g_data.dummy_zero :
+ grid_default_texture(attr->default_value);
DRW_shgroup_uniform_texture(grp, attr->input_name, grid_tex);
copy_m4_m4(volume_infos.grids_xform[grid_id++].ptr(), drw_grid->object_to_texture);
@@ -163,7 +163,7 @@ static DRWShadingGroup *drw_volume_object_mesh_init(Scene *scene,
VolumeUniformBufPool *pool = (VolumeUniformBufPool *)DST.vmempool->volume_grids_ubos;
VolumeInfosBuf &volume_infos = *pool->alloc();
- ModifierData *md = NULL;
+ ModifierData *md = nullptr;
volume_infos.density_scale = 1.0f;
volume_infos.color_mul = float4(1.0f);
@@ -173,7 +173,7 @@ static DRWShadingGroup *drw_volume_object_mesh_init(Scene *scene,
/* Smoke Simulation */
if ((md = BKE_modifiers_findby_type(ob, eModifierType_Fluid)) &&
(BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) &&
- ((FluidModifierData *)md)->domain != NULL) {
+ ((FluidModifierData *)md)->domain != nullptr) {
FluidModifierData *fmd = (FluidModifierData *)md;
FluidDomainSettings *fds = fmd->domain;
@@ -256,10 +256,8 @@ DRWShadingGroup *DRW_shgroup_volume_create_sub(Scene *scene,
if (ob == nullptr) {
return drw_volume_world_grids_init(&attrs, shgrp);
}
- else if (ob->type == OB_VOLUME) {
+ if (ob->type == OB_VOLUME) {
return drw_volume_object_grids_init(ob, &attrs, shgrp);
}
- else {
- return drw_volume_object_mesh_init(scene, ob, &attrs, shgrp);
- }
+ return drw_volume_object_mesh_init(scene, ob, &attrs, shgrp);
}
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc
index be0598919c7..8b62dd33961 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.cc
+++ b/source/blender/editors/sculpt_paint/paint_vertex.cc
@@ -156,7 +156,7 @@ static int get_vcol_elements(Mesh *me, size_t *r_elem_size)
}
}
-static void view_angle_limits_init(struct NormalAnglePrecalc *a, float angle, bool do_mask_normal)
+static void view_angle_limits_init(NormalAnglePrecalc *a, float angle, bool do_mask_normal)
{
angle = RAD2DEGF(angle);
a->do_mask_normal = do_mask_normal;
@@ -180,7 +180,7 @@ static void view_angle_limits_init(struct NormalAnglePrecalc *a, float angle, bo
a->angle_inner__cos = cosf(a->angle_inner);
}
-static float view_angle_limits_apply_falloff(const struct NormalAnglePrecalc *a,
+static float view_angle_limits_apply_falloff(const NormalAnglePrecalc *a,
float angle_cos,
float *mask_p)
{
@@ -232,7 +232,7 @@ static bool vertex_paint_use_fast_update_check(Object *ob)
{
const Mesh *me_eval = BKE_object_get_evaluated_mesh(ob);
- if (me_eval != NULL) {
+ if (me_eval != nullptr) {
Mesh *me = BKE_mesh_from_object(ob);
if (me && me->mloopcol) {
return (me->mloopcol == CustomData_get_layer(&me_eval->ldata, CD_PROP_BYTE_COLOR));
@@ -301,8 +301,8 @@ static bool weight_paint_poll_ex(bContext *C, bool check_tool)
Object *ob = CTX_data_active_object(C);
ScrArea *area;
- if ((ob != NULL) && (ob->mode & OB_MODE_WEIGHT_PAINT) &&
- (BKE_paint_brush(&CTX_data_tool_settings(C)->wpaint->paint) != NULL) &&
+ if ((ob != nullptr) && (ob->mode & OB_MODE_WEIGHT_PAINT) &&
+ (BKE_paint_brush(&CTX_data_tool_settings(C)->wpaint->paint) != nullptr) &&
(area = CTX_wm_area(C)) && (area->spacetype == SPACE_VIEW3D)) {
ARegion *region = CTX_wm_region(C);
if (ELEM(region->regiontype, RGN_TYPE_WINDOW, RGN_TYPE_HUD)) {
@@ -450,9 +450,9 @@ static void paint_and_tex_color_alpha_intern(VPaint *vp,
float r_rgba[4])
{
const Brush *brush = BKE_paint_brush(&vp->paint);
- BLI_assert(brush->mtex.tex != NULL);
+ BLI_assert(brush->mtex.tex != nullptr);
if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_3D) {
- BKE_brush_sample_tex_3d(vc->scene, brush, co, r_rgba, 0, NULL);
+ BKE_brush_sample_tex_3d(vc->scene, brush, co, r_rgba, 0, nullptr);
}
else {
float co_ss[2]; /* screenspace */
@@ -462,7 +462,7 @@ static void paint_and_tex_color_alpha_intern(VPaint *vp,
co_ss,
(eV3DProjTest)(V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_NEAR)) == V3D_PROJ_RET_OK) {
const float co_ss_3d[3] = {co_ss[0], co_ss[1], 0.0f}; /* we need a 3rd empty value */
- BKE_brush_sample_tex_3d(vc->scene, brush, co_ss_3d, r_rgba, 0, NULL);
+ BKE_brush_sample_tex_3d(vc->scene, brush, co_ss_3d, r_rgba, 0, nullptr);
}
else {
zero_v4(r_rgba);
@@ -568,7 +568,7 @@ static bool do_weight_paint_normalize_all_locked(MDeformVert *dvert,
uint i, tot = 0;
MDeformWeight *dw;
- if (lock_flags == NULL) {
+ if (lock_flags == nullptr) {
do_weight_paint_normalize_all(dvert, defbase_tot, vgroup_validmap);
return true;
}
@@ -783,7 +783,7 @@ struct WeightPaintGroupData {
* this _could_ be made a part of the operators 'WPaintData' struct, or at
* least a member, but for now keep its own struct, initialized on every
* paint stroke update - campbell */
-typedef struct WeightPaintInfo {
+struct WeightPaintInfo {
int defbase_tot;
@@ -791,7 +791,7 @@ typedef struct WeightPaintInfo {
int defbase_tot_sel;
int defbase_tot_unsel;
- struct WeightPaintGroupData active, mirror;
+ WeightPaintGroupData active, mirror;
/* boolean array for locked bones,
* length of defbase_tot */
@@ -814,7 +814,7 @@ typedef struct WeightPaintInfo {
bool is_normalized;
float brush_alpha_value; /* result of BKE_brush_alpha_get() */
-} WeightPaintInfo;
+};
static void do_weight_paint_vertex_single(
/* vars which remain the same for every vert */
@@ -843,7 +843,7 @@ static void do_weight_paint_vertex_single(
/* Check if we should mirror vertex groups (X-axis). */
if (ME_USING_MIRROR_X_VERTEX_GROUPS(me)) {
- index_mirr = mesh_get_x_mirror_vert(ob, NULL, index, topology);
+ index_mirr = mesh_get_x_mirror_vert(ob, nullptr, index, topology);
vgroup_mirr = wpi->mirror.index;
/* another possible error - mirror group _and_ active group are the same (which is fine),
@@ -881,7 +881,7 @@ static void do_weight_paint_vertex_single(
dw = BKE_defvert_ensure_index(dv, wpi->active.index);
}
- if (dw == NULL) {
+ if (dw == nullptr) {
return;
}
@@ -891,9 +891,9 @@ static void do_weight_paint_vertex_single(
if (wp->flag & VP_FLAG_VGROUP_RESTRICT) {
dw_mirr = BKE_defvert_find_index(dv_mirr, vgroup_mirr);
- if (dw_mirr == NULL) {
+ if (dw_mirr == nullptr) {
index_mirr = vgroup_mirr = -1;
- dv_mirr = NULL;
+ dv_mirr = nullptr;
}
}
else {
@@ -914,8 +914,8 @@ static void do_weight_paint_vertex_single(
}
}
else {
- dv_mirr = NULL;
- dw_mirr = NULL;
+ dv_mirr = nullptr;
+ dw_mirr = nullptr;
}
weight_cur = dw->weight;
@@ -1045,7 +1045,7 @@ static void do_weight_paint_vertex_multi(
/* mirror vars */
int index_mirr = -1;
- MDeformVert *dv_mirr = NULL;
+ MDeformVert *dv_mirr = nullptr;
/* weights */
float curw, curw_real, oldw, n
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list