[Bf-blender-cvs] [af4167441bc] master: Cleanup: clang-tidy
Campbell Barton
noreply at git.blender.org
Fri Jun 18 08:36:25 CEST 2021
Commit: af4167441bc37707c1ed32ded348bc0865f9c093
Author: Campbell Barton
Date: Fri Jun 18 14:27:43 2021 +1000
Branches: master
https://developer.blender.org/rBaf4167441bc37707c1ed32ded348bc0865f9c093
Cleanup: clang-tidy
===================================================================
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/lib_id_test.cc
M source/blender/blenkernel/intern/spline_base.cc
M source/blender/blenkernel/intern/subdiv_ccg.c
M source/blender/blenlib/tests/BLI_task_test.cc
M source/blender/blenloader/intern/versioning_common.cc
M source/blender/draw/intern/draw_cache_extract_mesh.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
M source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc
M source/blender/gpu/GPU_index_buffer.h
M source/blender/nodes/geometry/nodes/node_geo_raycast.cc
M source/blender/nodes/shader/nodes/node_shader_mixRgb.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 5ac85ad3aaf..9f5f70ab2ba 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -249,9 +249,7 @@ bool BKE_gpencil_is_first_lineart_in_stack(const Object *ob, const GpencilModifi
if (gmd == md) {
return true;
}
- else {
- return false;
- }
+ return false;
}
}
/* If we reach here it means md is not in ob's modifier stack. */
diff --git a/source/blender/blenkernel/intern/lib_id_test.cc b/source/blender/blenkernel/intern/lib_id_test.cc
index 8e21ae88aa6..f6988a2d71f 100644
--- a/source/blender/blenkernel/intern/lib_id_test.cc
+++ b/source/blender/blenkernel/intern/lib_id_test.cc
@@ -123,7 +123,7 @@ TEST(lib_id_main_unique_name, local_ids_1)
test_lib_id_main_sort_check_order({id_a, id_b, id_c});
BLI_strncpy(id_c->name, id_a->name, sizeof(id_c->name));
- BKE_id_new_name_validate(&ctx.bmain->objects, id_c, NULL, false);
+ BKE_id_new_name_validate(&ctx.bmain->objects, id_c, nullptr, false);
EXPECT_TRUE(strcmp(id_c->name + 2, "OB_A.001") == 0);
EXPECT_TRUE(strcmp(id_a->name + 2, "OB_A") == 0);
EXPECT_TRUE(ctx.bmain->objects.first == id_a);
@@ -150,7 +150,7 @@ TEST(lib_id_main_unique_name, linked_ids_1)
id_b->lib = lib_a;
id_sort_by_name(&ctx.bmain->objects, id_b, nullptr);
BLI_strncpy(id_b->name, id_a->name, sizeof(id_b->name));
- BKE_id_new_name_validate(&ctx.bmain->objects, id_b, NULL, true);
+ BKE_id_new_name_validate(&ctx.bmain->objects, id_b, nullptr, true);
EXPECT_TRUE(strcmp(id_b->name + 2, "OB_A.001") == 0);
EXPECT_TRUE(strcmp(id_a->name + 2, "OB_A") == 0);
EXPECT_TRUE(ctx.bmain->objects.first == id_c);
@@ -160,7 +160,7 @@ TEST(lib_id_main_unique_name, linked_ids_1)
id_b->lib = lib_b;
id_sort_by_name(&ctx.bmain->objects, id_b, nullptr);
BLI_strncpy(id_b->name, id_a->name, sizeof(id_b->name));
- BKE_id_new_name_validate(&ctx.bmain->objects, id_b, NULL, true);
+ BKE_id_new_name_validate(&ctx.bmain->objects, id_b, nullptr, true);
EXPECT_TRUE(strcmp(id_b->name + 2, "OB_A") == 0);
EXPECT_TRUE(strcmp(id_a->name + 2, "OB_A") == 0);
EXPECT_TRUE(ctx.bmain->objects.first == id_c);
diff --git a/source/blender/blenkernel/intern/spline_base.cc b/source/blender/blenkernel/intern/spline_base.cc
index e8294086c35..e375fa929ed 100644
--- a/source/blender/blenkernel/intern/spline_base.cc
+++ b/source/blender/blenkernel/intern/spline_base.cc
@@ -241,9 +241,7 @@ static float3 calculate_next_normal(const float3 &last_normal,
const float3 axis = float3::cross(last_tangent, current_tangent).normalized();
return rotate_direction_around_axis(last_normal, axis, angle);
}
- else {
- return last_normal;
- }
+ return last_normal;
}
static void calculate_normals_minimum(Span<float3> tangents,
diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c
index 5f732ba91ab..4ca6f93b014 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg.c
@@ -1042,7 +1042,7 @@ typedef struct AverageGridsBoundariesData {
CCGKey *key;
/* Optional lookup table. Maps task index to index in `subdiv_ccg->adjacent_vertices`. */
- int *adjacent_edge_index_map;
+ const int *adjacent_edge_index_map;
} AverageGridsBoundariesData;
typedef struct AverageGridsBoundariesTLSData {
@@ -1117,7 +1117,7 @@ typedef struct AverageGridsCornerData {
CCGKey *key;
/* Optional lookup table. Maps task range index to index in subdiv_ccg->adjacent_vertices*/
- int *adjacent_vert_index_map;
+ const int *adjacent_vert_index_map;
} AverageGridsCornerData;
static void subdiv_ccg_average_grids_corners(SubdivCCG *subdiv_ccg,
@@ -1161,7 +1161,7 @@ static void subdiv_ccg_average_grids_corners_task(void *__restrict userdata_v,
static void subdiv_ccg_average_boundaries(SubdivCCG *subdiv_ccg,
CCGKey *key,
- int *adjacent_edge_index_map,
+ const int *adjacent_edge_index_map,
int num_adjacent_edges)
{
TaskParallelSettings parallel_range_settings;
@@ -1186,7 +1186,7 @@ static void subdiv_ccg_average_all_boundaries(SubdivCCG *subdiv_ccg, CCGKey *key
static void subdiv_ccg_average_corners(SubdivCCG *subdiv_ccg,
CCGKey *key,
- int *adjacent_vert_index_map,
+ const int *adjacent_vert_index_map,
int num_adjacent_vertices)
{
TaskParallelSettings parallel_range_settings;
diff --git a/source/blender/blenlib/tests/BLI_task_test.cc b/source/blender/blenlib/tests/BLI_task_test.cc
index 52603428031..dd4441517a9 100644
--- a/source/blender/blenlib/tests/BLI_task_test.cc
+++ b/source/blender/blenlib/tests/BLI_task_test.cc
@@ -141,9 +141,9 @@ TEST(task, MempoolIter)
/* *** Parallel iterations over mempool items with TLS. *** */
-typedef struct TaskMemPool_Chunk {
+using TaskMemPool_Chunk = struct TaskMemPool_Chunk {
ListBase *accumulate_items;
-} TaskMemPool_Chunk;
+};
static void task_mempool_iter_tls_func(void *UNUSED(userdata),
MempoolIterData *item,
@@ -206,7 +206,7 @@ TEST(task, MempoolIterTLS)
BLI_parallel_mempool_settings_defaults(&settings);
TaskMemPool_Chunk tls_data;
- tls_data.accumulate_items = NULL;
+ tls_data.accumulate_items = nullptr;
settings.userdata_chunk = &tls_data;
settings.userdata_chunk_size = sizeof(tls_data);
diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc
index da3ff08a7dd..f5083b8e259 100644
--- a/source/blender/blenloader/intern/versioning_common.cc
+++ b/source/blender/blenloader/intern/versioning_common.cc
@@ -33,10 +33,10 @@ ARegion *do_versions_add_region_if_not_found(ListBase *regionbase,
const char *name,
int link_after_region_type)
{
- ARegion *link_after_region = NULL;
+ ARegion *link_after_region = nullptr;
LISTBASE_FOREACH (ARegion *, region, regionbase) {
if (region->regiontype == region_type) {
- return NULL;
+ return nullptr;
}
if (region->regiontype == link_after_region_type) {
link_after_region = region;
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.cc b/source/blender/draw/intern/draw_cache_extract_mesh.cc
index 021565fceac..b3399e98af7 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.cc
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.cc
@@ -126,7 +126,7 @@ class ExtractorRunDatas : public Vector<ExtractorRunData> {
return iter_type;
}
- const uint iter_types_len() const
+ uint iter_types_len() const
{
const eMRIterType iter_type = iter_types();
uint bits = static_cast<uint>(iter_type);
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
index 565f8834ab1..2dff101c71f 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
@@ -96,7 +96,7 @@ static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr),
constexpr MeshExtract create_extractor_edituv_tris()
{
- MeshExtract extractor = {0};
+ MeshExtract extractor = {nullptr};
extractor.init = extract_edituv_tris_init;
extractor.iter_looptri_bm = extract_edituv_tris_iter_looptri_bm;
extractor.iter_looptri_mesh = extract_edituv_tris_iter_looptri_mesh;
@@ -186,7 +186,7 @@ static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr),
constexpr MeshExtract create_extractor_edituv_lines()
{
- MeshExtract extractor = {0};
+ MeshExtract extractor = {nullptr};
extractor.init = extract_edituv_lines_init;
extractor.iter_poly_bm = extract_edituv_lines_iter_poly_bm;
extractor.iter_poly_mesh = extract_edituv_lines_iter_poly_mesh;
@@ -270,7 +270,7 @@ static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr),
constexpr MeshExtract create_extractor_edituv_points()
{
- MeshExtract extractor = {0};
+ MeshExtract extractor = {nullptr};
extractor.init = extract_edituv_points_init;
extractor.iter_poly_bm = extract_edituv_points_iter_poly_bm;
extractor.iter_poly_mesh = extract_edituv_points_iter_poly_mesh;
@@ -366,7 +366,7 @@ static void extract_edituv_fdots_finish(const MeshRenderData *UNUSED(mr),
constexpr MeshExtract create_extractor_edituv_fdots()
{
- MeshExtract extractor = {0};
+ MeshExtract extractor = {nullptr};
extractor.init = extract_edituv_fdots_init;
extractor.iter_poly_bm = extract_edituv_fdots_iter_poly_bm;
extractor.iter_poly_mesh = extract_edituv_fdots_iter_poly_mesh;
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
index 1d1a000061d..c21725ffa32 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
@@ -97,7 +97,7 @@ static void extract_fdots_finish(const MeshRenderData *UNUSED(mr),
constexpr MeshExtract create_extractor_fdots()
{
- MeshExtract extractor = {0};
+ MeshExtract extractor = {nullptr};
extractor.init = extract_fdots_init;
extractor.iter_poly_bm = extract_fdots_iter_poly_bm;
extractor.iter_poly_mesh = extract_fdots_iter_poly_mesh;
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
index 64aaed6600f..2c2603af1b2 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
@@ -157,7 +157,7 @@ static void extract_lines_finish(c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list