summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorM. Huri <kak_huri@yahoo.com>2021-10-12 11:12:19 +0700
committerM. Huri <kak_huri@yahoo.com>2021-10-12 11:12:19 +0700
commitb981c111c959d52cd1eb1318ca59b7dd16782ce2 (patch)
tree35bbfd533f500417ceaad4a98c760fa73c467e6c /modules
parentf9aec342dcd51d65c5970dd395e3c7a66cac446c (diff)
Fixed a typo in csg module
Diffstat (limited to 'modules')
-rw-r--r--modules/csg/csg.cpp2
-rw-r--r--modules/csg/csg.h2
-rw-r--r--modules/csg/csg_shape.cpp2
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);