From d465b92823d8063dc56612fdef0cfd5f4cdcc3e3 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 15 Feb 2023 17:39:53 -0500 Subject: [PATCH] Cleanup: Make format, fix missing static warning --- source/blender/blenkernel/intern/crazyspace.cc | 3 +-- source/blender/editors/mesh/editmesh_bisect.c | 2 +- .../blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc | 4 ++-- tests/python/bl_usd_export_test.py | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/blenkernel/intern/crazyspace.cc b/source/blender/blenkernel/intern/crazyspace.cc index 703454fef1c..d63ba6d08b3 100644 --- a/source/blender/blenkernel/intern/crazyspace.cc +++ b/source/blender/blenkernel/intern/crazyspace.cc @@ -596,8 +596,7 @@ void BKE_crazyspace_api_eval_clear(Object *object) namespace blender::bke::crazyspace { -GeometryDeformation get_evaluated_curves_deformation(const Object *ob_eval, - const Object &ob_orig) +GeometryDeformation get_evaluated_curves_deformation(const Object *ob_eval, const Object &ob_orig) { BLI_assert(ob_orig.type == OB_CURVES); const Curves &curves_id_orig = *static_cast(ob_orig.data); diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index 4fc225f5433..9114b4770dd 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -54,7 +54,7 @@ typedef struct { BMBackup mesh_backup; bool is_valid; bool is_dirty; - } *backup; + } * backup; int backup_len; } BisectData; diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc index b9ff59b6c6f..1624544a5ce 100644 --- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.cc @@ -12,9 +12,9 @@ #include "BLI_linklist.h" #include "BLI_listbase.h" #include "BLI_math.h" +#include "BLI_sort.hh" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLI_sort.hh" #include "BLI_vector.hh" #include "PIL_time.h" @@ -1889,7 +1889,7 @@ static void lineart_edge_neighbor_init_task(void *__restrict userdata, edge_nabr->flags = 0; } -void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length) +static void lineart_sort_adjacent_items(LineartAdjacentEdge *ai, int length) { blender::parallel_sort( ai, ai + length, [](const LineartAdjacentEdge &p1, const LineartAdjacentEdge &p2) { diff --git a/tests/python/bl_usd_export_test.py b/tests/python/bl_usd_export_test.py index 80edb89a9b3..1080acaf7e6 100644 --- a/tests/python/bl_usd_export_test.py +++ b/tests/python/bl_usd_export_test.py @@ -14,6 +14,7 @@ import bpy args = None + class AbstractUSDTest(unittest.TestCase): @classmethod def setUpClass(cls):