diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 09:17:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 09:17:07 +0400 |
commit | 38f546a614a2e52f284ebce64b9bcf6f287128b5 (patch) | |
tree | a2f126604979ee42014aad3180a76b93944e42e3 /source | |
parent | d2328154810ec6e4b477ab937908060b237f596e (diff) |
swap arg order for BM_edge_split(), makes sense to have edge as first
arg.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/bmesh/bmesh.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/BME_bevel.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 4ecc58e293a..aecf94e2892 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -220,7 +220,7 @@ BMEdge* BM_vert_collapse_edges(BMesh *bm, BMEdge *ke, BMVert *kv); /* 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); diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 1117a682f2a..25b70f56953 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -540,7 +540,7 @@ BMEdge *BM_vert_collapse_edges(BMesh *bm, BMEdge *ke, BMVert *kv) * 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 @@ BMVert *BM_edge_split_n(BMesh *bm, BMEdge *e, int numcuts) 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; } diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index ce00441dcac..50b66abd703 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -183,7 +183,7 @@ static BMVert *bm_subdivide_edge_addvert(BMesh *bm, BMEdge *edge, BMEdge *oedge, { 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); diff --git a/source/blender/bmesh/tools/BME_bevel.c b/source/blender/bmesh/tools/BME_bevel.c index ea1c6b1c422..540e5da29e7 100644 --- a/source/blender/bmesh/tools/BME_bevel.c +++ b/source/blender/bmesh/tools/BME_bevel.c @@ -289,7 +289,7 @@ static BMVert *BME_bevel_split_edge(BMesh *bm, BMVert *v, BMVert *v1, BMLoop *l, 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 @@ static BMVert *BME_bevel_split_edge(BMesh *bm, BMVert *v, BMVert *v1, BMLoop *l, 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); diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index b3053c2dbb0..8fdf061a0e3 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -2836,7 +2836,7 @@ static int pyrna_prop_collection_contains(BPy_PropertyRNA *self, PyObject *key) 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; } |