diff options
author | Hans Goudey <h.goudey@me.com> | 2022-06-23 02:58:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-06-23 02:58:25 +0300 |
commit | 1160a3a3f83cafda98e7bf6fb111bdacc5f28a63 (patch) | |
tree | b969f2508aac0cb59cd3fe81119dc1301a84bfb0 /source/blender/blenkernel | |
parent | d2a3b99ff7abb3d7deb30da4554b1cda6ff32766 (diff) |
Cleanup: Clang tidy
Mainly duplicate includes and else after return.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_geom.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_modifier.c | 15 |
3 files changed, 7 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index f86e947910b..3d546c5c36a 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -55,8 +55,6 @@ #include "BLO_read_write.h" -#include "BKE_gpencil.h" - static CLG_LogRef LOG = {"bke.gpencil"}; static void greasepencil_copy_data(Main *UNUSED(bmain), diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc index 792474d30ea..0445a1540c7 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.cc +++ b/source/blender/blenkernel/intern/gpencil_geom.cc @@ -25,8 +25,6 @@ #include "BLI_polyfill_2d.h" #include "BLI_span.hh" -#include "BLT_translation.h" - #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenkernel/intern/subdiv_modifier.c b/source/blender/blenkernel/intern/subdiv_modifier.c index f5423dccc0f..57af0192d59 100644 --- a/source/blender/blenkernel/intern/subdiv_modifier.c +++ b/source/blender/blenkernel/intern/subdiv_modifier.c @@ -44,15 +44,14 @@ bool BKE_subsurf_modifier_runtime_init(SubsurfModifierData *smd, const bool use_ return false; } - else { - /* Allocate runtime data if it did not exist yet. */ - if (runtime_data == NULL) { - runtime_data = MEM_callocN(sizeof(*runtime_data), "subsurf runtime"); - smd->modifier.runtime = runtime_data; - } - runtime_data->settings = settings; - return true; + + /* Allocate runtime data if it did not exist yet. */ + if (runtime_data == NULL) { + runtime_data = MEM_callocN(sizeof(*runtime_data), "subsurf runtime"); + smd->modifier.runtime = runtime_data; } + runtime_data->settings = settings; + return true; } static ModifierData *modifier_get_last_enabled_for_mode(const Scene *scene, |