diff options
author | Campbell Barton <campbell@blender.org> | 2022-10-12 02:29:44 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-10-12 02:39:12 +0300 |
commit | 3f64b886847ac3384bd4303a5c689b486d878636 (patch) | |
tree | 3a06c3aa228cb5311e60fb57a08068213cbd4959 | |
parent | 984b279ef143c82d1f45cbd3e846aa15bcd47997 (diff) |
Cleanup: use function style casts for C++, format & spelling
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 1 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.cc | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 3 | ||||
-rw-r--r-- | tests/python/bl_io_curve_svg_test.py | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index e8c0d4586bd..3a02492635a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -5519,6 +5519,7 @@ class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu): op = pie.operator("sculpt.reveal_all", text='Show All') + class VIEW3D_MT_wpaint_vgroup_lock_pie(Menu): bl_label = "Vertex Group Locks" diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc index 34b1ce949a7..d810e782a1b 100644 --- a/source/blender/editors/mesh/editmesh_undo.cc +++ b/source/blender/editors/mesh/editmesh_undo.cc @@ -231,7 +231,7 @@ static void um_arraystore_cd_compact(CustomData *cdata, } bcd->states[i] = BLI_array_store_state_add( - bs, layer->data, (size_t)data_len * stride, state_reference); + bs, layer->data, size_t(data_len) * stride, state_reference); } else { bcd->states[i] = nullptr; @@ -334,7 +334,7 @@ static void um_arraystore_compact_ex(UndoMesh *um, const UndoMesh *um_ref, bool um_ref->store.keyblocks[i] : nullptr; um->store.keyblocks[i] = BLI_array_store_state_add( - bs, keyblock->data, (size_t)keyblock->totelem * stride, state_reference); + bs, keyblock->data, size_t(keyblock->totelem) * stride, state_reference); } if (keyblock->data) { @@ -352,7 +352,7 @@ static void um_arraystore_compact_ex(UndoMesh *um, const UndoMesh *um_ref, bool BArrayStore *bs = BLI_array_store_at_size_ensure( &um_arraystore.bs_stride, stride, ARRAY_CHUNK_SIZE); um->store.mselect = BLI_array_store_state_add( - bs, me->mselect, (size_t)me->totselect * stride, state_reference); + bs, me->mselect, size_t(me->totselect) * stride, state_reference); } /* keep me->totselect for validation */ diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 129bb604ed0..c46fd019725 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4409,8 +4409,7 @@ static void sculpt_update_cache_invariants( } /* Original coordinates require the sculpt undo system, which isn't used - * for image brushes. It's also not necassary, just disable it. - */ + * for image brushes. It's also not necessary, just disable it. */ if (brush && brush->sculpt_tool == SCULPT_TOOL_PAINT && SCULPT_use_image_paint_brush(&tool_settings->paint_mode, ob)) { cache->original = false; diff --git a/tests/python/bl_io_curve_svg_test.py b/tests/python/bl_io_curve_svg_test.py index c67abde5475..092dfa5497a 100644 --- a/tests/python/bl_io_curve_svg_test.py +++ b/tests/python/bl_io_curve_svg_test.py @@ -47,7 +47,6 @@ def main(): idiff = args.idiff[0] output_dir = args.outdir[0] - from modules import render_report report = render_report.Report('IO Curve SVG', output_dir, idiff) report.set_pixelated(True) |