diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:14:36 +0300 |
| commit | f35e9f047a0381732a41ec331945b7a0654ee578 (patch) | |
| tree | 5be3c632483cf2bc2960b21789849af27c9b2b59 /source/blender/blenkernel/intern/mesh_merge.c | |
| parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
| parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index d49ca507e02..5324c397ebf 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -342,13 +342,13 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar void **val_p; if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) { - newe[i] = GET_INT_FROM_POINTER(*val_p); + newe[i] = POINTER_AS_INT(*val_p); } else { STACK_PUSH(olde, i); STACK_PUSH(medge, *med); newe[i] = c; - *val_p = SET_INT_IN_POINTER(c); + *val_p = POINTER_FROM_INT(c); c++; } } @@ -507,7 +507,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar uint v2 = mlv; BLI_assert(v1 != v2); if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) { - last_valid_ml->e = GET_INT_FROM_POINTER(*val_p); + last_valid_ml->e = POINTER_AS_INT(*val_p); } else { const int new_eidx = STACK_SIZE(medge); @@ -516,7 +516,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar medge[new_eidx].v1 = last_valid_ml->v; medge[new_eidx].v2 = ml->v; /* DO NOT change newe mapping, could break actual values due to some deleted original edges. */ - *val_p = SET_INT_IN_POINTER(new_eidx); + *val_p = POINTER_FROM_INT(new_eidx); created_edges++; last_valid_ml->e = new_eidx; @@ -559,7 +559,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar uint v2 = (vtargetmap[first_valid_ml->v] != -1) ? vtargetmap[first_valid_ml->v] : first_valid_ml->v; BLI_assert(v1 != v2); if (BLI_edgehash_ensure_p(ehash, v1, v2, &val_p)) { - last_valid_ml->e = GET_INT_FROM_POINTER(*val_p); + last_valid_ml->e = POINTER_AS_INT(*val_p); } else { const int new_eidx = STACK_SIZE(medge); @@ -568,7 +568,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar medge[new_eidx].v1 = last_valid_ml->v; medge[new_eidx].v2 = first_valid_ml->v; /* DO NOT change newe mapping, could break actual values due to some deleted original edges. */ - *val_p = SET_INT_IN_POINTER(new_eidx); + *val_p = POINTER_FROM_INT(new_eidx); created_edges++; last_valid_ml->e = new_eidx; |