blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T52871: beauty fill error 

Only lock tri's facing different directions.
Needed because scanfill creates zero area faces.
This commit is contained in:
Campbell Barton 2017-09-26 12:14:46 +10:00
parent 293dc4e084
commit e40e29cd38
Notes: blender-bot 2023-02-14 06:32:26 +01:00 
Referenced by issue #53683, 2.79a release
Referenced by issue #52871, beauty fill error with daily build
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenlib/intern/polyfill2d_beautify.c
View File

@ -149,16 +149,15 @@ float BLI_polyfill_beautify_quad_rotate_calc_ex(
* - Area sign flipping to check faces aren't going to point in opposite directions.
* - Area epsilon check that the one of the faces won't be zero area.
*/
if (((area_2x_123 >= 0.0f) != (area_2x_134 >= 0.0f)) ||
(fabsf(area_2x_123) <= FLT_EPSILON) || (fabsf(area_2x_134) <= FLT_EPSILON))
{
if ((area_2x_123 >= 0.0f) != (area_2x_134 >= 0.0f)) {
break;
}
else if ((fabsf(area_2x_123) <= FLT_EPSILON) || (fabsf(area_2x_134) <= FLT_EPSILON)) {
break;
}
/* Test for unusable (2-4) state (same as above). */
if (((area_2x_234 >= 0.0f) != (area_2x_241 >= 0.0f)) ||
((fabsf(area_2x_234) <= FLT_EPSILON) || (fabsf(area_2x_241) <= FLT_EPSILON)))
{
if ((area_2x_234 >= 0.0f) != (area_2x_241 >= 0.0f)) {
if (lock_degenerate) {
break;
}
@ -166,6 +165,9 @@ float BLI_polyfill_beautify_quad_rotate_calc_ex(
return -FLT_MAX; /* always rotate */
}
}
else if ((fabsf(area_2x_234) <= FLT_EPSILON) || (fabsf(area_2x_241) <= FLT_EPSILON)) {
return -FLT_MAX; /* always rotate */
}
{
/* testing rule: the area divided by the perimeter,