From ad6e63cb96a497721d7ad6aeb5cf119d3264036c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 7 Aug 2020 17:59:12 +0200 Subject: [PATCH] Cleanup: enable Clang-Tidy `bugprone-parent-virtual-call` rule I added a single `NOLINT` exception with explanation. No functional changes. --- .clang-tidy | 1 - .../blender/freestyle/intern/scene_graph/OrientedLineRep.cpp | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index 1f3a05e22d4..3f24e7718e2 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -31,7 +31,6 @@ Checks: > -bugprone-sizeof-expression, -bugprone-integer-division, -bugprone-incorrect-roundings, - -bugprone-parent-virtual-call, -bugprone-copy-constructor-init, WarningsAsErrors: '*' diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp index 9e83527acad..e8e21d37d00 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp @@ -27,7 +27,9 @@ namespace Freestyle { void OrientedLineRep::accept(SceneVisitor &v) { - Rep::accept(v); + Rep::accept(v); // NOLINT(bugprone-parent-virtual-call), this seems to intentionally *not* call + // the parent class' accept() function, but rather the grandparent's. The + // v.visitLineRep(*this); call below is actually what the parent class would do. if (!frs_material()) { v.visitOrientedLineRep(*this); }