godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-18 14:21:41 +00:00
Code Releases Wiki Activity

Fixed a typo in csg module

Browse Source
This commit is contained in:
M. Huri
2021-10-12 11:13:29 +07:00
parent 754db65a1f
commit 37ccfb18ff
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/csg/csg.cpp
View File

@@ -408,7 +408,7 @@ void CSGBrushOperation::merge_brushes(Operation p_operation, const CSGBrush &p_b
} break; } break;
case OPERATION_SUBSTRACTION: { case OPERATION_SUBTRACTION: {
int face_count = 0; int face_count = 0;
for (int i = 0; i < mesh_merge.faces.size(); i++) { for (int i = 0; i < mesh_merge.faces.size(); i++) {

2
modules/csg/csg.h
View File

@@ -68,7 +68,7 @@ struct CSGBrushOperation {
enum Operation { enum Operation {
OPERATION_UNION, OPERATION_UNION,
OPERATION_INTERSECTION, 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); void merge_brushes(Operation p_operation, const CSGBrush &p_brush_a, const CSGBrush &p_brush_b, CSGBrush &r_merged_brush, float p_vertex_snap);

2
modules/csg/csg_shape.cpp
View File

@@ -185,7 +185,7 @@ CSGBrush *CSGShape::_get_brush() {
bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap); bop.merge_brushes(CSGBrushOperation::OPERATION_INTERSECTION, *n, *nn2, *nn, snap);
break; break;
case CSGShape::OPERATION_SUBTRACTION: 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; break;
} }
memdelete(n); memdelete(n);