diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-23 13:20:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-23 13:20:15 +0400 |
| commit | e91e1814d0cd6de342f64a6307f1359a7757cf62 (patch) | |
| tree | 4c272ddc77118d2d3defac8bd91ec9bf2d02c6f8 /source/blender/bmesh | |
| parent | 9bae78ed5d2261c9d61c854d405286741fcb39b2 (diff) | |
fix own error in BM_data_interp_from_edges() from recent commit.
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 16488501651..9033436d1b2 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -46,7 +46,7 @@ #include "intern/bmesh_private.h" /* edge and vertex share, currently theres no need to have different logic */ -static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2, BMElem *ele_dst, const float fac) +static void bm_data_interp_from_elem(CustomData *data_layer, BMElem *ele1, BMElem *ele2, BMElem *ele_dst, const float fac) { if (ele1->head.data && ele2->head.data) { /* first see if we can avoid interpolation */ @@ -55,8 +55,8 @@ static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2, BMEl /* do nothing */ } else { - CustomData_bmesh_free_block(&bm->vdata, &ele_dst->head.data); - CustomData_bmesh_copy_data(&bm->vdata, &bm->vdata, ele1->head.data, &ele_dst->head.data); + CustomData_bmesh_free_block(data_layer, &ele_dst->head.data); + CustomData_bmesh_copy_data(data_layer, data_layer, ele1->head.data, &ele_dst->head.data); } } else if (fac >= 1.0f) { @@ -64,8 +64,8 @@ static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2, BMEl /* do nothing */ } else { - CustomData_bmesh_free_block(&bm->vdata, &ele_dst->head.data); - CustomData_bmesh_copy_data(&bm->vdata, &bm->vdata, ele2->head.data, &ele_dst->head.data); + CustomData_bmesh_free_block(data_layer, &ele_dst->head.data); + CustomData_bmesh_copy_data(data_layer, data_layer, ele2->head.data, &ele_dst->head.data); } } else { @@ -76,7 +76,7 @@ static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2, BMEl src[1] = ele2->head.data; w[0] = 1.0f - fac; w[1] = fac; - CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2, ele_dst->head.data); + CustomData_bmesh_interp(data_layer, src, w, NULL, 2, ele_dst->head.data); } } } @@ -90,7 +90,7 @@ static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2, BMEl */ void BM_data_interp_from_verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, const float fac) { - bm_data_interp_from_elem(bm, (BMElem *)v1, (BMElem *)v2, (BMElem *)v, fac); + bm_data_interp_from_elem(&bm->vdata, (BMElem *)v1, (BMElem *)v2, (BMElem *)v, fac); } /** @@ -102,7 +102,7 @@ void BM_data_interp_from_verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v, con */ void BM_data_interp_from_edges(BMesh *bm, BMEdge *e1, BMEdge *e2, BMEdge *e, const float fac) { - bm_data_interp_from_elem(bm, (BMElem *)e1, (BMElem *)e2, (BMElem *)e, fac); + bm_data_interp_from_elem(&bm->edata, (BMElem *)e1, (BMElem *)e2, (BMElem *)e, fac); } /** |