diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-12 08:36:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 08:36:02 +0200 |
| commit | 34624068583e472cc69c6864be360821265e764b (patch) | |
| tree | 4efad9cf39e7a41f16a2a906d3a017a571caaf6c | |
| parent | 1bd6a2f0200acdab0fb595b614756cc09fc1d2d7 (diff) | |
| parent | b981c111c959d52cd1eb1318ca59b7dd16782ce2 (diff) | |
Merge pull request #53694 from CakHuri/fix-typo-csg
Fixed a typo in csg module
| -rw-r--r-- | modules/csg/csg.cpp | 2 | ||||
| -rw-r--r-- | modules/csg/csg.h | 2 | ||||
| -rw-r--r-- | modules/csg/csg_shape.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index 53694035dc..5ffe644495 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -408,7 +408,7 @@ void CSGBrushOperation::merge_brushes(Operation p_operation, const CSGBrush &p_b } break; - case OPERATION_SUBSTRACTION: { + case OPERATION_SUBTRACTION: { int face_count = 0; for (int i = 0; i < mesh_merge.faces.size(); i++) { diff --git a/modules/csg/csg.h b/modules/csg/csg.h index c872860486..b1fe933268 100644 --- a/modules/csg/csg.h +++ b/modules/csg/csg.h @@ -67,7 +67,7 @@ struct CSGBrushOperation { enum Operation { OPERATION_UNION, OPERATION_INTERSECTION, - OPERATION_SUBSTRACTION, + OPERATION_SUBTRACTION, }; void merge_brushes(Operation p_operation, const CSGBrush &p_brush_a, const CSGBrush &p_brush_b, CSGBrush &r_merged_brush, float p_vertex_snap); diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index e4297a593e..14e7896295 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -192,7 +192,7 @@ CSGBrush *CSGShape3D::_get_brush() { bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap); break; case CSGShape3D::OPERATION_SUBTRACTION: - bop.merge_brushes(CSGBrushOperation::OPERATION_SUBSTRACTION, *n, *nn2, *nn, snap); + bop.merge_brushes(CSGBrushOperation::OPERATION_SUBTRACTION, *n, *nn2, *nn, snap); break; } memdelete(n); |