From 0c0f972e86a2e38912114c5333f23f9effd37a3b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 11 Aug 2020 13:19:09 +1000 Subject: Cleanup: spelling --- source/blender/blenlib/BLI_string_ref.hh | 2 +- source/blender/blenlib/tests/BLI_ghash_test.cc | 4 ++-- .../blender/blenlib/tests/BLI_math_matrix_test.cc | 4 ++-- .../performance/BLI_ghash_performance_test.cc | 2 +- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- source/blender/editors/sculpt_paint/paint_cursor.c | 8 ++++---- .../blender/editors/sculpt_paint/sculpt_boundary.c | 23 ++++++++++++---------- .../windowmanager/xr/intern/wm_xr_session.c | 4 ++-- 8 files changed, 26 insertions(+), 23 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenlib/BLI_string_ref.hh b/source/blender/blenlib/BLI_string_ref.hh index 72803ebecda..e30eccca891 100644 --- a/source/blender/blenlib/BLI_string_ref.hh +++ b/source/blender/blenlib/BLI_string_ref.hh @@ -385,7 +385,7 @@ inline std::string operator+(StringRef a, StringRef b) /* This does not compare StringRef and std::string_view, because of ambiguous overloads. This is * not a problem when std::string_view is only used at api boundaries. To compare a StringRef and a * std::string_view, one should convert the std::string_view to StringRef (which is very cheap). - * Ideally, we only use StringRef in our code to avoid this problem alltogether. */ + * Ideally, we only use StringRef in our code to avoid this problem altogether. */ inline bool operator==(StringRef a, StringRef b) { if (a.size() != b.size()) { diff --git a/source/blender/blenlib/tests/BLI_ghash_test.cc b/source/blender/blenlib/tests/BLI_ghash_test.cc index fcc0512cb9e..484f158a85c 100644 --- a/source/blender/blenlib/tests/BLI_ghash_test.cc +++ b/source/blender/blenlib/tests/BLI_ghash_test.cc @@ -80,8 +80,8 @@ TEST(ghash, InsertLookup) BLI_ghash_free(ghash, NULL, NULL); } -/* Here we simply insert and then remove all keys, ensuring we do get an empty, unshrinked ghash. - */ +/* Here we simply insert and then remove all keys, ensuring we do get an empty, + * ghash that has not been shrunk. */ TEST(ghash, InsertRemove) { GHash *ghash = BLI_ghash_new(BLI_ghashutil_inthash_p, BLI_ghashutil_intcmp, __func__); diff --git a/source/blender/blenlib/tests/BLI_math_matrix_test.cc b/source/blender/blenlib/tests/BLI_math_matrix_test.cc index 9c47c02ceaf..2a4e0e98613 100644 --- a/source/blender/blenlib/tests/BLI_math_matrix_test.cc +++ b/source/blender/blenlib/tests/BLI_math_matrix_test.cc @@ -45,8 +45,8 @@ TEST(math_matrix, interp_m4_m4m4_regular) TEST(math_matrix, interp_m3_m3m3_singularity) { - /* A singluarity means that there is an axis mirror in the rotation component of the matrix. This - * is reflected in its negative determinant. + /* A singularity means that there is an axis mirror in the rotation component of the matrix. + * This is reflected in its negative determinant. * * The interpolation of 4x4 matrices performs linear interpolation on the translation component, * and then uses the 3x3 interpolation function to handle rotation and scale. As a result, this diff --git a/source/blender/blenlib/tests/performance/BLI_ghash_performance_test.cc b/source/blender/blenlib/tests/performance/BLI_ghash_performance_test.cc index c471b32a39a..f93c40f05fb 100644 --- a/source/blender/blenlib/tests/performance/BLI_ghash_performance_test.cc +++ b/source/blender/blenlib/tests/performance/BLI_ghash_performance_test.cc @@ -479,7 +479,7 @@ TEST(ghash, Int2NoHash50000000) } #endif -/* MultiSmall: create and manipulate a lot of very small ghashes +/* MultiSmall: create and manipulate a lot of very small ghash's * (90% < 10 items, 9% < 100 items, 1% < 1000 items). */ static void multi_small_ghash_tests_one(GHash *ghash, RNG *rng, const unsigned int nbr) diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 0ffd4f594e7..ec3ed05375c 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2001,7 +2001,7 @@ static void calculate_profile(BevelParams *bp, BoundVert *bndv, bool reversed, b /* Calculate the 3D locations for the profile points */ calculate_profile_segments( pro, map, use_map, reversed, bp->seg, pro_spacing->xvals, pro_spacing->yvals, pro->prof_co); - /* Also calcualte for the is the seg_2 case if it's needed .*/ + /* Also calculate for the is the seg_2 case if it's needed .*/ if (need_2) { calculate_profile_segments(pro, map, diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index a4101bdd89f..88998d5063d 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1296,8 +1296,8 @@ static bool paint_cursor_context_init(bContext *C, pcontext->zoomx = max_ff(zoomx, zoomy); pcontext->final_radius = (BKE_brush_size_get(pcontext->scene, pcontext->brush) * zoomx); - /* There is currently no way to check if the direction is invertex before starting the stroke, so - * this does not reflect the state of the brush in the UI. */ + /* There is currently no way to check if the direction is inverted before starting the stroke, + * so this does not reflect the state of the brush in the UI. */ if (((pcontext->ups->draw_inverted == 0) ^ ((pcontext->brush->flag & BRUSH_DIR_IN) == 0)) && BKE_brush_sculpt_has_secondary_color(pcontext->brush)) { copy_v3_v3(pcontext->outline_col, pcontext->brush->sub_col); @@ -1549,8 +1549,8 @@ static void paint_cursor_draw_3d_view_brush_cursor_inactive(PaintCursorContext * { Brush *brush = pcontext->brush; - /* 2D fallof is better represented with the default 2D cursor, there is no need to draw anything - * else. */ + /* 2D falloff is better represented with the default 2D cursor, + * there is no need to draw anything else. */ if (brush->falloff_shape == PAINT_FALLOFF_SHAPE_TUBE) { paint_draw_legacy_3D_view_brush_cursor(pcontext); return; diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.c b/source/blender/editors/sculpt_paint/sculpt_boundary.c index c6ed0701704..a368214cb0b 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.c +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.c @@ -161,8 +161,10 @@ static void sculpt_boundary_preview_edge_add(SculptBoundary *bdata, const int v1 } }; -/* This funcion is used to check where the propagation should stop when calculating the boundary, - * as well as to check if the initial vertex is valid. */ +/** + * This function is used to check where the propagation should stop when calculating the boundary, + * as well as to check if the initial vertex is valid. + */ static bool sculpt_boundary_is_vertex_in_editable_boundary(SculptSession *ss, const int initial_vertex) { @@ -178,14 +180,14 @@ static bool sculpt_boundary_is_vertex_in_editable_boundary(SculptSession *ss, } SCULPT_VERTEX_NEIGHBORS_ITER_END(ni); - /* Corners are ambiguous as it can't be decied which boundary should be active. The flood fill + /* Corners are ambiguous as it can't be decide which boundary should be active. The flood fill * should also stop at corners. */ if (neighbor_count <= 2) { return false; } - /* Non manifold geomery in the mesh boundary. The deformation result will be unpredictable and - * not very useful. */ + /* Non manifold geometry in the mesh boundary. + * The deformation result will be unpredictable and not very useful. */ if (boundary_vertex_count > 2) { return false; } @@ -266,11 +268,12 @@ static void sculpt_boundary_indices_init(SculptSession *ss, BLI_gset_free(included_vertices, NULL); } -/* This functions initializes all data needed to calcualte falloffs and deformation from the - * boundary into the mesh into a SculptBoundaryEditInfo array. This includes how many steps are +/** + * This functions initializes all data needed to calculate falloffs and deformation from the + * boundary into the mesh into a #SculptBoundaryEditInfo array. This includes how many steps are * needed to go from a boundary vertex to an interior vertex and which vertex of the boundary is - * the closest one. */ - + * the closest one. + */ static void sculpt_boundary_edit_data_init(SculptSession *ss, SculptBoundary *bdata, const int initial_vertex, @@ -399,7 +402,7 @@ static void sculpt_boundary_edit_data_init(SculptSession *ss, BLI_gsqueue_free(next_iteration); } -/* This functions assings a falloff factor to each one of the SculptBoundaryEditInfo structs based +/* This functions assigns a falloff factor to each one of the SculptBoundaryEditInfo structs based * on the brush curve and its propagation steps. The falloff goes from the boundary into the mesh. */ static void sculpt_boundary_falloff_factor_init(SculptSession *ss, diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c index 99f8a40e541..f3ce7be993f 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.c +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c @@ -250,8 +250,8 @@ void wm_xr_session_draw_data_update(const wmXrSessionState *state, switch (event) { case SESSION_STATE_EVENT_START: - /* We want to start the session exactly at landmark position. Runtimes may have a non-[0,0,0] - * starting position that we have to substract for that. */ + /* We want to start the session exactly at landmark position. + * Run-times may have a non-[0,0,0] starting position that we have to subtract for that. */ copy_v3_v3(draw_data->eye_position_ofs, draw_view->local_pose.position); break; /* This should be triggered by the VR add-on if a landmark changes. */ -- cgit v1.2.3