From 37ccfb18ffcf90a60c8596f850d83f57349c07e5 Mon Sep 17 00:00:00 2001 From: "M. Huri" Date: Tue, 12 Oct 2021 11:13:29 +0700 Subject: [PATCH] Fixed a typo in csg module --- modules/csg/csg.cpp | 2 +- modules/csg/csg.h | 2 +- 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 001eaa47e20..bd9fea6c0b7 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 6a68bbf07f6..37dca3906ce 100644 --- a/modules/csg/csg.h +++ b/modules/csg/csg.h @@ -68,7 +68,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 5d0d9bb7fab..6cd89edbae4 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -185,7 +185,7 @@ CSGBrush *CSGShape::_get_brush() { bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap); break; case CSGShape::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);