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>2017-09-19 07:25:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-03 14:49:48 +0300
commit6e133ad8b13e0615647488aed9251b1fc970344b (patch)
tree8fa3d0243147a41d59496eb04556ac264df8b959
parent58ab62ed6d89b8f839a7652ce44942bac3467d80 (diff)
Correct recent error in boolean quad split check
-rw-r--r--source/blender/bmesh/intern/bmesh_polygon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index f0023470099..7b9d17b27b5 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -1523,7 +1523,7 @@ void BM_mesh_calc_tessellation_beauty(BMesh *bm, BMLoop *(*looptris)[3], int *r_
* Use #BLI_polyfill_beautify_quad_rotate_calc since we have the normal.
*/
#if 0
- const bool split_24 = (BM_verts_calc_rotate_beauty(
+ const bool split_13 = (BM_verts_calc_rotate_beauty(
l_v1->v, l_v2->v, l_v3->v, l_v4->v, 0, 0) < 0.0f);
#else
float axis_mat[3][3], v_quad[4][2];
@@ -1533,13 +1533,13 @@ void BM_mesh_calc_tessellation_beauty(BMesh *bm, BMLoop *(*looptris)[3], int *r_
mul_v2_m3v3(v_quad[2], axis_mat, l_v3->v->co);
mul_v2_m3v3(v_quad[3], axis_mat, l_v4->v->co);
- const bool split_24 = BLI_polyfill_beautify_quad_rotate_calc(
+ const bool split_13 = BLI_polyfill_beautify_quad_rotate_calc(
v_quad[0], v_quad[1], v_quad[2], v_quad[3]) < 0.0f;
#endif
BMLoop **l_ptr_a = looptris[i++];
BMLoop **l_ptr_b = looptris[i++];
- if (split_24 == 0) {
+ if (split_13) {
l_ptr_a[0] = l_v1;
l_ptr_a[1] = l_v2;
l_ptr_a[2] = l_v3;