diff options
Diffstat (limited to 'source/blender')
4 files changed, 13 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 527288d06cf..ccd1434b60b 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -156,7 +156,7 @@ class FairingContext { loop_weight); } - void fair_vertices_ex(bool *affected, + void fair_vertices_ex(const bool *affected, const int order, VertexWeight *vertex_weight, LoopWeight *loop_weight) @@ -240,15 +240,15 @@ class MeshFairingContext : public FairingContext { } } - ~MeshFairingContext() + ~MeshFairingContext() override { MEM_SAFE_FREE(vlmap_); MEM_SAFE_FREE(vlmap_mem_); } - virtual void adjacents_coords_from_loop(const int loop, - float r_adj_next[3], - float r_adj_prev[3]) override + void adjacents_coords_from_loop(const int loop, + float r_adj_next[3], + float r_adj_prev[3]) override { const int vert = mloop_[loop].v; const MPoly *p = &mpoly_[loop_to_poly_map_[loop]]; @@ -257,7 +257,7 @@ class MeshFairingContext : public FairingContext { copy_v3_v3(r_adj_prev, co_[ME_POLY_LOOP_PREV(mloop_, p, corner)->v]); } - virtual int other_vertex_index_from_loop(const int loop, const unsigned int v) override + int other_vertex_index_from_loop(const int loop, const unsigned int v) override { MEdge *e = &medge_[mloop_[loop].e]; if (e->v1 == v) { @@ -318,21 +318,21 @@ class BMeshFairingContext : public FairingContext { } } - ~BMeshFairingContext() + ~BMeshFairingContext() override { MEM_SAFE_FREE(vlmap_); MEM_SAFE_FREE(vlmap_mem_); } - virtual void adjacents_coords_from_loop(const int loop, - float r_adj_next[3], - float r_adj_prev[3]) override + void adjacents_coords_from_loop(const int loop, + float r_adj_next[3], + float r_adj_prev[3]) override { copy_v3_v3(r_adj_next, bmloop_[loop]->next->v->co); copy_v3_v3(r_adj_prev, bmloop_[loop]->prev->v->co); } - virtual int other_vertex_index_from_loop(const int loop, const unsigned int v) override + int other_vertex_index_from_loop(const int loop, const unsigned int v) override { BMLoop *l = bmloop_[loop]; BMVert *bmvert = BM_vert_at_index(bm, v); diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 9aded9137ec..86293f273b3 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -686,6 +686,7 @@ static void do_versions_291_fcurve_handles_limit(FCurve *fcu) } } +/* NOLINTNEXTLINE: readability-function-size */ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) { UNUSED_VARS(fd); diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc index 47764efa15d..e53157cb5f8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc @@ -27,8 +27,8 @@ #include "node_geometry_util.hh" +#include <cstring> #include <iostream> -#include <string.h> namespace blender::nodes { diff --git a/source/blender/sequencer/intern/utils.c b/source/blender/sequencer/intern/utils.c index ab0b65dba7f..a76cfb76e62 100644 --- a/source/blender/sequencer/intern/utils.c +++ b/source/blender/sequencer/intern/utils.c @@ -578,6 +578,4 @@ void SEQ_set_scale_to_fit(const Sequence *seq, transform->scale_y = 1.0f; break; } - - return; } |