[Bf-blender-cvs] [3f64b886847] master: Cleanup: use function style casts for C++, format & spelling

Campbell Barton noreply at git.blender.org
Wed Oct 12 01:48:38 CEST 2022


Commit: 3f64b886847ac3384bd4303a5c689b486d878636
Author: Campbell Barton
Date:   Wed Oct 12 10:29:44 2022 +1100
Branches: master
https://developer.blender.org/rB3f64b886847ac3384bd4303a5c689b486d878636

Cleanup: use function style casts for C++, format & spelling

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/mesh/editmesh_undo.cc
M	source/blender/editors/sculpt_paint/sculpt.c
M	tests/python/bl_io_curve_svg_test.py

===================================================================

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)



More information about the Bf-blender-cvs mailing list