[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43857] branches/bmesh/blender/source/ blender/bmesh/operators/connectops.c: fix [#30054] Bridge edge loops crashes attached .blend
Campbell Barton
ideasman42 at gmail.com
Thu Feb 2 20:51:57 CET 2012
Revision: 43857
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43857
Author: campbellbarton
Date: 2012-02-02 19:51:53 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
fix [#30054] Bridge edge loops crashes attached .blend
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
Modified: branches/bmesh/blender/source/blender/bmesh/operators/connectops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2012-02-02 19:38:41 UTC (rev 43856)
+++ branches/bmesh/blender/source/blender/bmesh/operators/connectops.c 2012-02-02 19:51:53 UTC (rev 43857)
@@ -186,7 +186,7 @@
}
else {
/* edges do not form a loop: there is a disk
- with more than two marked edges. */
+ * with more than two marked edges. */
BMO_RaiseError(bm, op, BMERR_INVALID_SELECTION,
"Selection must only contain edges from two edge loops");
goto cleanup;
@@ -235,7 +235,7 @@
}
}
- /*test for connected loops, and set cl1 or cl2 if so*/
+ /* test for connected loops, and set cl1 or cl2 if so */
if (v == ov) {
if (c==0)
cl1 = 1;
@@ -352,7 +352,7 @@
}
if (wdir == 0) {
for (i=0; i<BLI_array_count(ee1); i++) {
- j = clamp_index((i * dir1) + starti, lenv1);
+ j = clamp_index((i * dir1) + starti, BLI_array_count(ee1));
if (ee1[j]->l && ee2[j]->l) {
wdir = (ee2[j]->l->v == vv2[j]) ? (1) : (-1);
break;
More information about the Bf-blender-cvs
mailing list