diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-12 10:25:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 10:25:48 +0100 |
| commit | 14b41d0fc9fd615f17a8a082cd2bbfb9fea7f0a8 (patch) | |
| tree | 7ce9a51814f1264cc21b5cc1ab7baa7439f2e961 /modules/csg | |
| parent | aeff25f3134c1af34285bb1021c709936cf5377d (diff) | |
| parent | 7bf6e5f7732f3fa890561255610f50a65e755adf (diff) | |
Merge pull request #36987 from luzpaz/typos
Fix various typos
Diffstat (limited to 'modules/csg')
| -rw-r--r-- | modules/csg/csg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index e9ca1d3e5b..4e39cce4a5 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -88,7 +88,7 @@ static inline bool ray_intersects_triangle(const Vector3 &p_from, const Vector3 Vector3 edge2 = p_vertices[2] - p_vertices[0]; Vector3 h = p_dir.cross(edge2); real_t a = edge1.dot(h); - // Check if ray is parrallel to triangle. + // Check if ray is parallel to triangle. if (Math::is_zero_approx(a)) return false; real_t f = 1.0 / a; @@ -818,7 +818,7 @@ void CSGBrushOperation::Build2DFaces::_add_vertex_idx_sorted(Vector<int> &r_vert int axis = 0; if (Math::abs(new_point.x - first_point.x) < Math::abs(new_point.y - first_point.y)) axis = 1; - // Add it to the beginnig or the end appropriately. + // Add it to the beginning or the end appropriately. if (new_point[axis] < first_point[axis]) r_vertex_indices.insert(0, p_new_vertex_index); else @@ -868,7 +868,7 @@ void CSGBrushOperation::Build2DFaces::_merge_faces(const Vector<int> &p_segment_ inner_idx = p_segment_indices[segments + segments / 2 - sorted_idx]; } - // Find the mergable faces. + // Find the mergeable faces. Vector<int> merge_faces_idx; Vector<Face2D> merge_faces; Vector<int> merge_faces_inner_vertex_idx; |