Revision: 44355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44355
Author: campbellbarton
Date: 2012-02-23 05:17:07 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
swap arg order for BM_edge_split(), makes sense to have edge as first
arg.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-23 04:26:24 UTC (rev
44354)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-23 05:17:07 UTC (rev
44355)
@@ -220,7 +220,7 @@
/* splits an edge. ne is set to the new edge created. */
-BMVert *BM_edge_split(BMesh *bm, BMVert *v, BMEdge *e, BMEdge **ne, float
percent);
+BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **ne, float
percent);
/* split an edge multiple times evenly */
BMVert *BM_edge_split_n(BMesh *bm, BMEdge *e, int numcuts);
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-23
04:26:24 UTC (rev 44354)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-23
05:17:07 UTC (rev 44355)
@@ -540,7 +540,7 @@
* the new vert
*/
-BMVert *BM_edge_split(BMesh *bm, BMVert *v, BMEdge *e, BMEdge **ne, float
percent)
+BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **ne, float
percent)
{
BMVert *nv, *v2;
BMFace **oldfaces = NULL;
@@ -658,7 +658,7 @@
for (i = 0; i < numcuts; i++) {
percent = 1.0f / (float)(numcuts + 1 - i);
- nv = BM_edge_split(bm, e->v2, e, NULL, percent);
+ nv = BM_edge_split(bm, e, e->v2, NULL, percent);
}
return nv;
}
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
2012-02-23 04:26:24 UTC (rev 44354)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
2012-02-23 05:17:07 UTC (rev 44355)
@@ -183,7 +183,7 @@
{
BMVert *ev;
- ev = BM_edge_split(bm, edge->v1, edge, out, percent);
+ ev = BM_edge_split(bm, edge, edge->v1, out, percent);
BMO_elem_flag_enable(bm, ev, ELE_INNER);
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-02-23
04:26:24 UTC (rev 44354)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-02-23
05:17:07 UTC (rev 44355)
@@ -289,7 +289,7 @@
e1 = e2;
}
ov = BM_edge_other_vert(e1, v);
- sv = BM_edge_split(bm, v, e1, &ne, 0);
+ sv = BM_edge_split(bm, e1, v, &ne, 0);
//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /* this is
technically wrong.. */
//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
@@ -331,7 +331,7 @@
else {
is_split_vert = 0;
ov = BM_edge_other_vert(l->e, v);
- sv = BM_edge_split(bm, v, l->e, &ne, 0);
+ sv = BM_edge_split(bm, l->e, v, &ne, 0);
//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /*
this is technically wrong.. */
//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2012-02-23
04:26:24 UTC (rev 44354)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2012-02-23
05:17:07 UTC (rev 44355)
@@ -2836,7 +2836,7 @@
if (keyname == NULL) {
PyErr_SetString(PyExc_TypeError,
- "bpy_prop_collection.__contains__:
expected a string or a typle of strings");
+ "bpy_prop_collection.__contains__:
expected a string or a tuple of strings");
return -1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
