[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55949] trunk/blender/source/blender/ blenlib/intern/scanfill.c: fix [#34947] Alt-F Fill not working
Campbell Barton
ideasman42 at gmail.com
Thu Apr 11 01:59:38 CEST 2013
Revision: 55949
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55949
Author: campbellbarton
Date: 2013-04-10 23:59:37 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
fix [#34947] Alt-F Fill not working
Regression in r54579.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54579
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/scanfill.c
Modified: trunk/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/scanfill.c 2013-04-10 23:52:07 UTC (rev 55948)
+++ trunk/blender/source/blender/blenlib/intern/scanfill.c 2013-04-10 23:59:37 UTC (rev 55949)
@@ -456,13 +456,13 @@
for (eed = sf_ctx->filledgebase.first; eed; eed = eed->next) {
if (eve != eed->v1 && eve != eed->v2 && eve->poly_nr == eed->poly_nr) {
- if (compare_v3v3(eve->co, eed->v1->co, SF_EPSILON)) {
+ if (compare_v2v2(eve->xy, eed->v1->xy, SF_EPSILON)) {
ed1->v2 = eed->v1;
eed->v1->edge_tot++;
eve->edge_tot = 0;
break;
}
- else if (compare_v3v3(eve->co, eed->v2->co, SF_EPSILON)) {
+ else if (compare_v2v2(eve->xy, eed->v2->xy, SF_EPSILON)) {
ed1->v2 = eed->v2;
eed->v2->edge_tot++;
eve->edge_tot = 0;
@@ -732,11 +732,11 @@
/* prevent angle calc for the simple cases only 1 vertex is found */
if (firsttime == false) {
- best_angle = angle_v2v2v2(v2->co, v1->co, best_sc->vert->co);
+ best_angle = angle_v2v2v2(v2->xy, v1->xy, best_sc->vert->xy);
firsttime = true;
}
- angle = angle_v2v2v2(v2->co, v1->co, sc1->vert->co);
+ angle = angle_v2v2v2(v2->xy, v1->xy, sc1->vert->xy);
if (angle < best_angle) {
best_sc = sc1;
best_angle = angle;
More information about the Bf-blender-cvs
mailing list