Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-12 05:15:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-12 05:15:09 +0300
commit189032c7248af2537014ef07e4c026e37d24422e (patch)
tree4fc7d563212e617b81256ed1f47c4fb7ea557543 /source/blender/bmesh
parentaae93ae4c6c13e2b30ba272e24354dd020880868 (diff)
Correct error in last boolean commit
Side was flipped
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r--source/blender/bmesh/intern/bmesh_polygon_edgenet.c2
-rw-r--r--source/blender/bmesh/tools/bmesh_intersect.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
index 39fd445b4c9..420fb26ca08 100644
--- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
+++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c
@@ -852,7 +852,7 @@ static int bm_face_split_edgenet_find_connection(
* so return a fall-back vertex in that case.
*/
- const float dir[3] = {[SORT_AXIS] = direction_sign ? 1.0 : -1.0f};
+ const float dir[3] = {[SORT_AXIS] = direction_sign ? 1.0f : -1.0f};
BMEdge *e_hit = test_edges_isect_2d_ray(args, v_origin, dir);
BMVert *v_other = NULL;
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index a1c2701a151..646b4d02286 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -1560,6 +1560,7 @@ bool BM_mesh_intersect(
continue;
}
BLI_assert(ELEM(side, 0, 1));
+ side = !side;
// BM_face_calc_center_mean(f, co);
BM_face_calc_point_in_face(f, co);