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/bmesh/tools | |
| parent | 0ad183bf0289c3b9b1af0cd581bc30435cae3800 (diff) | |
| parent | bb3ec3ebafbc2c0e5d8530148a433242e0adad30 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/bmesh/tools')
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 8 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_intersect.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index ed32a9bbc2c..10910855de8 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1698,21 +1698,21 @@ static void bevel_harden_normals_mode(BevelParams *bp, BevVert *bv, BMOperator * BMFace *f_a, *f_b; BM_edge_face_pair(e, &f_a, &f_b); - if (f_a && !BLI_ghash_haskey(tempfaceHash, SET_UINT_IN_POINTER(BM_elem_index_get(f_a)))) { + if (f_a && !BLI_ghash_haskey(tempfaceHash, POINTER_FROM_UINT(BM_elem_index_get(f_a)))) { int f_area = BM_face_calc_area(f_a); float f_no[3]; copy_v3_v3(f_no, f_a->no); mul_v3_fl(f_no, f_area); add_v3_v3(n_final, f_no); - BLI_ghash_insert(tempfaceHash, SET_UINT_IN_POINTER(BM_elem_index_get(f_a)), NULL); + BLI_ghash_insert(tempfaceHash, POINTER_FROM_UINT(BM_elem_index_get(f_a)), NULL); } - if (f_b && !BLI_ghash_haskey(tempfaceHash, SET_UINT_IN_POINTER(BM_elem_index_get(f_b)))) { + if (f_b && !BLI_ghash_haskey(tempfaceHash, POINTER_FROM_UINT(BM_elem_index_get(f_b)))) { int f_area = BM_face_calc_area(f_b); float f_no[3]; copy_v3_v3(f_no, f_b->no); mul_v3_fl(f_no, f_area); add_v3_v3(n_final, f_no); - BLI_ghash_insert(tempfaceHash, SET_UINT_IN_POINTER(BM_elem_index_get(f_b)), NULL); + BLI_ghash_insert(tempfaceHash, POINTER_FROM_UINT(BM_elem_index_get(f_b)), NULL); } } } diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index a35bb81a1c2..1b37b7721b2 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -226,7 +226,7 @@ static void face_edges_add( BMEdge *e, const bool use_test) { - void *f_index_key = SET_INT_IN_POINTER(f_index); + void *f_index_key = POINTER_FROM_INT(f_index); BLI_assert(e->head.htype == BM_EDGE); BLI_assert(BM_edge_in_face(e, s->bm->ftable[f_index]) == false); BLI_assert(BM_elem_index_get(s->bm->ftable[f_index]) == f_index); @@ -1478,7 +1478,7 @@ bool BM_mesh_intersect( faces = bm->ftable; GHASH_ITER (gh_iter, s.face_edges) { - const int f_index = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter)); + const int f_index = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter)); BMFace *f; struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter); |