Browse Source

Merge pull request #41200 from madmiraal/fix-38001-3.2

[3.2] Mark the first shape as inside, not the second shape, when CSG shapes are co-planer.
Rémi Verschelde 5 years ago
parent
commit
0a26217579
1 changed files with 2 additions and 2 deletions
  1. 2 2
      modules/csg/csg.cpp

+ 2 - 2
modules/csg/csg.cpp

@@ -596,8 +596,8 @@ bool CSGBrushOperation::MeshMerge::_bvh_inside(FaceBVH *facebvhptr, int p_max_de
 							// Check if faces are co-planar.
 							if ((current_normal - face_normal).length_squared() < CMP_EPSILON2 &&
 									is_point_in_triangle(face_center, current_points)) {
-								// Only add an intersection if checking a B face.
-								if (face.from_b)
+								// Only add an intersection if not a B face.
+								if (!face.from_b)
 									_add_distance(intersectionsA, intersectionsB, current_face.from_b, 0);
 							} else if (ray_intersects_triangle(face_center, face_normal, current_points, CMP_EPSILON, intersection_point)) {
 								real_t distance = (intersection_point - face_center).length();