[Bf-blender-cvs] [9a855f94fc1] master: Cleanup: Spelling

Sergey Sharybin noreply at git.blender.org
Fri Feb 28 10:45:18 CET 2020


Commit: 9a855f94fc178df5a7afe47ac8b9998f6d835783
Author: Sergey Sharybin
Date:   Thu Feb 27 14:40:26 2020 +0100
Branches: master
https://developer.blender.org/rB9a855f94fc178df5a7afe47ac8b9998f6d835783

Cleanup: Spelling

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

M	source/blender/blenkernel/intern/subdiv_eval.c
M	source/blender/blenkernel/intern/subdiv_foreach.c
M	source/blender/freestyle/intern/stroke/Stroke.h

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

diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c
index bf5e886dd22..615698cad49 100644
--- a/source/blender/blenkernel/intern/subdiv_eval.c
+++ b/source/blender/blenkernel/intern/subdiv_eval.c
@@ -80,7 +80,7 @@ static void set_coarse_positions(Subdiv *subdiv,
       BLI_BITMAP_ENABLE(vertex_used_map, loop->v);
     }
   }
-  for (int vertex_index = 0, manifold_veretx_index = 0; vertex_index < mesh->totvert;
+  for (int vertex_index = 0, manifold_vertex_index = 0; vertex_index < mesh->totvert;
        vertex_index++) {
     if (!BLI_BITMAP_TEST_BOOL(vertex_used_map, vertex_index)) {
       continue;
@@ -93,8 +93,8 @@ static void set_coarse_positions(Subdiv *subdiv,
       const MVert *vertex = &mvert[vertex_index];
       vertex_co = vertex->co;
     }
-    subdiv->evaluator->setCoarsePositions(subdiv->evaluator, vertex_co, manifold_veretx_index, 1);
-    manifold_veretx_index++;
+    subdiv->evaluator->setCoarsePositions(subdiv->evaluator, vertex_co, manifold_vertex_index, 1);
+    manifold_vertex_index++;
   }
   MEM_freeN(vertex_used_map);
 }
diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c
index 884b8d74790..0f56fc5ec21 100644
--- a/source/blender/blenkernel/intern/subdiv_foreach.c
+++ b/source/blender/blenkernel/intern/subdiv_foreach.c
@@ -525,13 +525,13 @@ static void subdiv_foreach_edge_vertices_special_do(SubdivForeachTaskContext *ct
     const bool flip = (coarse_edge->v2 == coarse_loop->v);
     int subdiv_vertex_index = ctx->vertices_edge_offset +
                               coarse_edge_index * num_subdiv_vertices_per_coarse_edge;
-    int veretx_delta = 1;
+    int vertex_delta = 1;
     if (flip) {
       subdiv_vertex_index += num_subdiv_vertices_per_coarse_edge - 1;
-      veretx_delta = -1;
+      vertex_delta = -1;
     }
     for (int vertex_index = 1; vertex_index < num_vertices_per_ptex_edge;
-         vertex_index++, subdiv_vertex_index += veretx_delta) {
+         vertex_index++, subdiv_vertex_index += vertex_delta) {
       const float u = vertex_index * inv_ptex_resolution_1;
       vertex_edge(ctx->foreach_context,
                   tls,
@@ -546,7 +546,7 @@ static void subdiv_foreach_edge_vertices_special_do(SubdivForeachTaskContext *ct
     const int next_corner = (corner + 1) % coarse_poly->totloop;
     const int next_ptex_face_index = ptex_face_start_index + next_corner;
     for (int vertex_index = 1; vertex_index < num_vertices_per_ptex_edge - 1;
-         vertex_index++, subdiv_vertex_index += veretx_delta) {
+         vertex_index++, subdiv_vertex_index += vertex_delta) {
       const float v = 1.0f - vertex_index * inv_ptex_resolution_1;
       vertex_edge(ctx->foreach_context,
                   tls,
@@ -829,7 +829,7 @@ static void subdiv_foreach_edges_all_patches_regular(SubdivForeachTaskContext *c
     const bool flip = (coarse_edge->v2 == coarse_loop->v);
     int side_start_index = start_vertex_index;
     int side_stride = 0;
-    /* Calculate starting veretx of corresponding inner part of ptex. */
+    /* Calculate starting vertex of corresponding inner part of ptex. */
     if (corner == 0) {
       side_stride = 1;
     }
@@ -1210,7 +1210,7 @@ static void subdiv_foreach_loops_regular(SubdivForeachTaskContext *ctx,
       v3 = ctx->vertices_edge_offset + prev_coarse_loop->e * num_subdiv_vertices_per_coarse_edge;
       e3 = ctx->edge_boundary_offset + prev_coarse_loop->e * num_subdiv_edges_per_coarse_edge;
     }
-    /* Calculate starting veretx of corresponding inner part of ptex. */
+    /* Calculate starting vertex of corresponding inner part of ptex. */
     if (corner == 0) {
       side_stride = 1;
       e2_offset = 0;
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index ffca8b92c6d..7983e8cdde2 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -620,7 +620,7 @@ class Stroke : public Interface1D {
    *  \param iVertex:
    *    The StrokeVertex to insert in the Stroke.
    *  \param next:
-   *    A StrokeVertexIterator pointing to the StrokeVeretx before which iVertex must be inserted.
+   *    A StrokeVertexIterator pointing to the StrokeVertex before which iVertex must be inserted.
    */
   void InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next);



More information about the Bf-blender-cvs mailing list