diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:05:58 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-19 05:12:21 +0300 |
| commit | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (patch) | |
| tree | d30aaa3df2d03f90f6e7749bdc075445a5642045 /source/blender/blenkernel/intern/mesh.c | |
| parent | 4c918efd44be11d47afc1efed684a15ad5579722 (diff) | |
BLI_utildefines: rename pointer conversion macros
Terms get/set don't make much sense when casting values.
Name macros so the conversion is obvious,
use common prefix for easier completion.
- GET_INT_FROM_POINTER -> POINTER_AS_INT
- SET_INT_IN_POINTER -> POINTER_FROM_INT
- GET_UINT_FROM_POINTER -> POINTER_AS_UINT
- SET_UINT_IN_POINTER -> POINTER_FROM_UINT
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 6d481472074..e7450b528c8 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1445,7 +1445,7 @@ static int split_faces_prepare_new_verts( if ((*lnor_space)->flags & MLNOR_SPACE_IS_SINGLE) { /* Single loop in this fan... */ - BLI_assert(GET_INT_FROM_POINTER((*lnor_space)->loops) == loop_idx); + BLI_assert(POINTER_AS_INT((*lnor_space)->loops) == loop_idx); BLI_BITMAP_ENABLE(done_loops, loop_idx); if (vert_used) { ml->v = new_vert_idx; @@ -1453,7 +1453,7 @@ static int split_faces_prepare_new_verts( } else { for (LinkNode *lnode = (*lnor_space)->loops; lnode; lnode = lnode->next) { - const int ml_fan_idx = GET_INT_FROM_POINTER(lnode->link); + const int ml_fan_idx = POINTER_AS_INT(lnode->link); BLI_BITMAP_ENABLE(done_loops, ml_fan_idx); if (vert_used) { mloop[ml_fan_idx].v = new_vert_idx; @@ -1514,7 +1514,7 @@ static int split_faces_prepare_new_edges( if (BLI_BITMAP_TEST(edges_used, edge_idx)) { /* Original edge has already been used, we need to define a new one. */ const int new_edge_idx = num_edges++; - *eval = SET_INT_IN_POINTER(new_edge_idx); + *eval = POINTER_FROM_INT(new_edge_idx); ml_prev->e = new_edge_idx; SplitFaceNewEdge *new_edge = BLI_memarena_alloc(memarena, sizeof(*new_edge)); @@ -1529,13 +1529,13 @@ static int split_faces_prepare_new_edges( /* We can re-use original edge. */ medge[edge_idx].v1 = ml_prev->v; medge[edge_idx].v2 = ml->v; - *eval = SET_INT_IN_POINTER(edge_idx); + *eval = POINTER_FROM_INT(edge_idx); BLI_BITMAP_ENABLE(edges_used, edge_idx); } } else { /* Edge already known, just update loop's edge index. */ - ml_prev->e = GET_INT_FROM_POINTER(*eval); + ml_prev->e = POINTER_AS_INT(*eval); } ml_prev = ml; |