Merge branch 'master' into blender2.8

6 files changed, 45 insertions, 45 deletions

diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.c b/source/blender/bmesh/intern/bmesh_callback_generic.c
index e9304e8536f..90b2497aa80 100644
--- a/source/blender/bmesh/intern/bmesh_callback_generic.c
+++ b/source/blender/bmesh/intern/bmesh_callback_generic.c
@@ -32,7 +32,7 @@
 
 bool BM_elem_cb_check_hflag_ex(BMElem *ele, void *user_data)
 {
-	const uint hflag_pair = GET_INT_FROM_POINTER(user_data);
+	const uint hflag_pair = POINTER_AS_INT(user_data);
 	const char hflag_p = (hflag_pair & 0xff);
 	const char hflag_n = (hflag_pair >> 8);
 
@@ -42,14 +42,14 @@ bool BM_elem_cb_check_hflag_ex(BMElem *ele, void *user_data)
 
 bool BM_elem_cb_check_hflag_enabled(BMElem *ele, void *user_data)
 {
-	const char hflag = GET_INT_FROM_POINTER(user_data);
+	const char hflag = POINTER_AS_INT(user_data);
 
 	return (BM_elem_flag_test(ele, hflag) != 0);
 }
 
 bool BM_elem_cb_check_hflag_disabled(BMElem *ele, void *user_data)
 {
-	const char hflag = GET_INT_FROM_POINTER(user_data);
+	const char hflag = POINTER_AS_INT(user_data);
 
 	return (BM_elem_flag_test(ele, hflag) == 0);
 }
diff --git a/source/blender/bmesh/intern/bmesh_callback_generic.h b/source/blender/bmesh/intern/bmesh_callback_generic.h
index 3cae01d417f..44495d54edd 100644
--- a/source/blender/bmesh/intern/bmesh_callback_generic.h
+++ b/source/blender/bmesh/intern/bmesh_callback_generic.h
@@ -32,14 +32,14 @@ bool BM_elem_cb_check_elem_not_equal(BMElem *ele, void *user_data);
 
 #define BM_elem_cb_check_hflag_ex_simple(type, hflag_p, hflag_n) \
 	(bool (*)(type, void *))BM_elem_cb_check_hflag_ex, \
-	SET_UINT_IN_POINTER(((hflag_p) | (hflag_n << 8)))
+	POINTER_FROM_UINT(((hflag_p) | (hflag_n << 8)))
 
 #define BM_elem_cb_check_hflag_enabled_simple(type, hflag_p) \
 	(bool (*)(type, void *))BM_elem_cb_check_hflag_enabled, \
-	SET_UINT_IN_POINTER((hflag_p))
+	POINTER_FROM_UINT((hflag_p))
 
 #define BM_elem_cb_check_hflag_disabled_simple(type, hflag_n) \
 	(bool (*)(type, void *))BM_elem_cb_check_hflag_disabled, \
-	SET_UINT_IN_POINTER(hflag_n)
+	POINTER_FROM_UINT(hflag_n)
 
 #endif /* __BMESH_CALLBACK_GENERIC_H__ */
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 30ab0dd9459..732647f83a7 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -134,13 +134,13 @@ typedef struct {
 static uint bm_log_vert_id_get(BMLog *log, BMVert *v)
 {
 	BLI_assert(BLI_ghash_haskey(log->elem_to_id, v));
-	return GET_UINT_FROM_POINTER(BLI_ghash_lookup(log->elem_to_id, v));
+	return POINTER_AS_UINT(BLI_ghash_lookup(log->elem_to_id, v));
 }
 
 /* Set the vertex's unique ID in the log */
 static void bm_log_vert_id_set(BMLog *log, BMVert *v, uint id)
 {
-	void *vid = SET_UINT_IN_POINTER(id);
+	void *vid = POINTER_FROM_UINT(id);
 
 	BLI_ghash_reinsert(log->id_to_elem, vid, v, NULL, NULL);
 	BLI_ghash_reinsert(log->elem_to_id, v, vid, NULL, NULL);
@@ -149,7 +149,7 @@ static void bm_log_vert_id_set(BMLog *log, BMVert *v, uint id)
 /* Get a vertex from its unique ID */
 static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
 {
-	void *key = SET_UINT_IN_POINTER(id);
+	void *key = POINTER_FROM_UINT(id);
 	BLI_assert(BLI_ghash_haskey(log->id_to_elem, key));
 	return BLI_ghash_lookup(log->id_to_elem, key);
 }
@@ -158,13 +158,13 @@ static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
 static uint bm_log_face_id_get(BMLog *log, BMFace *f)
 {
 	BLI_assert(BLI_ghash_haskey(log->elem_to_id, f));
-	return GET_UINT_FROM_POINTER(BLI_ghash_lookup(log->elem_to_id, f));
+	return POINTER_AS_UINT(BLI_ghash_lookup(log->elem_to_id, f));
 }
 
 /* Set the face's unique ID in the log */
 static void bm_log_face_id_set(BMLog *log, BMFace *f, uint id)
 {
-	void *fid = SET_UINT_IN_POINTER(id);
+	void *fid = POINTER_FROM_UINT(id);
 
 	BLI_ghash_reinsert(log->id_to_elem, fid, f, NULL, NULL);
 	BLI_ghash_reinsert(log->elem_to_id, f, fid, NULL, NULL);
@@ -173,7 +173,7 @@ static void bm_log_face_id_set(BMLog *log, BMFace *f, uint id)
 /* Get a face from its unique ID */
 static BMFace *bm_log_face_from_id(BMLog *log, uint id)
 {
-	void *key = SET_UINT_IN_POINTER(id);
+	void *key = POINTER_FROM_UINT(id);
 	BLI_assert(BLI_ghash_haskey(log->id_to_elem, key));
 	return BLI_ghash_lookup(log->id_to_elem, key);
 }
@@ -255,7 +255,7 @@ static void bm_log_verts_unmake(BMesh *bm, BMLog *log, GHash *verts)
 	GHASH_ITER (gh_iter, verts) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
 		BMLogVert *lv = BLI_ghashIterator_getValue(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 		BMVert *v = bm_log_vert_from_id(log, id);
 
 		/* Ensure the log has the final values of the vertex before
@@ -271,7 +271,7 @@ static void bm_log_faces_unmake(BMesh *bm, BMLog *log, GHash *faces)
 	GHashIterator gh_iter;
 	GHASH_ITER (gh_iter, faces) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 		BMFace *f = bm_log_face_from_id(log, id);
 		BMEdge *e_tri[3];
 		BMLoop *l_iter;
@@ -304,7 +304,7 @@ static void bm_log_verts_restore(BMesh *bm, BMLog *log, GHash *verts)
 		vert_mask_set(v, lv->mask, cd_vert_mask_offset);
 		v->head.hflag = lv->hflag;
 		normal_short_to_float_v3(v->no, lv->no);
-		bm_log_vert_id_set(log, v, GET_UINT_FROM_POINTER(key));
+		bm_log_vert_id_set(log, v, POINTER_AS_UINT(key));
 	}
 }
 
@@ -321,7 +321,7 @@ static void bm_log_faces_restore(BMesh *bm, BMLog *log, GHash *faces)
 
 		f = BM_face_create_verts(bm, v, 3, NULL, BM_CREATE_NOP, true);
 		f->head.hflag = lf->hflag;
-		bm_log_face_id_set(log, f, GET_UINT_FROM_POINTER(key));
+		bm_log_face_id_set(log, f, POINTER_AS_UINT(key));
 	}
 }
 
@@ -333,7 +333,7 @@ static void bm_log_vert_values_swap(BMesh *bm, BMLog *log, GHash *verts)
 	GHASH_ITER (gh_iter, verts) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
 		BMLogVert *lv = BLI_ghashIterator_getValue(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 		BMVert *v = bm_log_vert_from_id(log, id);
 		float mask;
 		short normal[3];
@@ -355,7 +355,7 @@ static void bm_log_face_values_swap(BMLog *log, GHash *faces)
 	GHASH_ITER (gh_iter, faces) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
 		BMLogFace *lf = BLI_ghashIterator_getValue(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 		BMFace *f = bm_log_face_from_id(log, id);
 
 		SWAP(char, f->head.hflag, lf->hflag);
@@ -425,7 +425,7 @@ static void bm_log_id_ghash_retake(RangeTreeUInt *unused_ids, GHash *id_ghash)
 
 	GHASH_ITER (gh_iter, id_ghash) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 
 		range_tree_uint_retake(unused_ids, id);
 	}
@@ -454,8 +454,8 @@ static GHash *bm_log_compress_ids_to_indices(uint *ids, uint totid)
 	qsort(ids, totid, sizeof(*ids), uint_compare);
 
 	for (i = 0; i < totid; i++) {
-		void *key = SET_UINT_IN_POINTER(ids[i]);
-		void *val = SET_UINT_IN_POINTER(i);
+		void *key = POINTER_FROM_UINT(ids[i]);
+		void *val = POINTER_FROM_UINT(i);
 		BLI_ghash_insert(map, key, val);
 	}
 
@@ -469,7 +469,7 @@ static void bm_log_id_ghash_release(BMLog *log, GHash *id_ghash)
 
 	GHASH_ITER (gh_iter, id_ghash) {
 		void *key = BLI_ghashIterator_getKey(&gh_iter);
-		uint id = GET_UINT_FROM_POINTER(key);
+		uint id = POINTER_AS_UINT(key);
 		range_tree_uint_release(log->unused_ids, id);
 	}
 }
@@ -620,9 +620,9 @@ void BM_log_mesh_elems_reorder(BMesh *bm, BMLog *log)
 	id_to_idx = bm_log_compress_ids_to_indices(varr, (uint)bm->totvert);
 	BM_ITER_MESH_INDEX (v, &bm_iter, bm, BM_VERTS_OF_MESH, i) {
 		const unsigned id = bm_log_vert_id_get(log, v);
-		const void *key = SET_UINT_IN_POINTER(id);
+		const void *key = POINTER_FROM_UINT(id);
 		const void *val = BLI_ghash_lookup(id_to_idx, key);
-		varr[i] = GET_UINT_FROM_POINTER(val);
+		varr[i] = POINTER_AS_UINT(val);
 	}
 	BLI_ghash_free(id_to_idx, NULL, NULL);
 
@@ -630,9 +630,9 @@ void BM_log_mesh_elems_reorder(BMesh *bm, BMLog *log)
 	id_to_idx = bm_log_compress_ids_to_indices(farr, (uint)bm->totface);
 	BM_ITER_MESH_INDEX (f, &bm_iter, bm, BM_FACES_OF_MESH, i) {
 		const unsigned id = bm_log_face_id_get(log, f);
-		const void *key = SET_UINT_IN_POINTER(id);
+		const void *key = POINTER_FROM_UINT(id);
 		const void *val = BLI_ghash_lookup(id_to_idx, key);
-		farr[i] = GET_UINT_FROM_POINTER(val);
+		farr[i] = POINTER_AS_UINT(val);
 	}
 	BLI_ghash_free(id_to_idx, NULL, NULL);
 
@@ -840,7 +840,7 @@ void BM_log_vert_before_modified(BMLog *log, BMVert *v, const int cd_vert_mask_o
 	BMLogEntry *entry = log->current_entry;
 	BMLogVert *lv;
 	uint v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 	void **val_p;
 
 	/* Find or create the BMLogVert entry */
@@ -864,7 +864,7 @@ void BM_log_vert_added(BMLog *log, BMVert *v, const int cd_vert_mask_offset)
 {
 	BMLogVert *lv;
 	uint v_id = range_tree_uint_take_any(log->unused_ids);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	bm_log_vert_id_set(log, v, v_id);
 	lv = bm_log_vert_alloc(log, v, cd_vert_mask_offset);
@@ -881,7 +881,7 @@ void BM_log_face_modified(BMLog *log, BMFace *f)
 {
 	BMLogFace *lf;
 	uint f_id = bm_log_face_id_get(log, f);
-	void *key = SET_UINT_IN_POINTER(f_id);
+	void *key = POINTER_FROM_UINT(f_id);
 
 	lf = bm_log_face_alloc(log, f);
 	BLI_ghash_insert(log->current_entry->modified_faces, key, lf);
@@ -897,7 +897,7 @@ void BM_log_face_added(BMLog *log, BMFace *f)
 {
 	BMLogFace *lf;
 	uint f_id = range_tree_uint_take_any(log->unused_ids);
-	void *key = SET_UINT_IN_POINTER(f_id);
+	void *key = POINTER_FROM_UINT(f_id);
 
 	/* Only triangles are supported for now */
 	BLI_assert(f->len == 3);
@@ -927,7 +927,7 @@ void BM_log_vert_removed(BMLog *log, BMVert *v, const int cd_vert_mask_offset)
 {
 	BMLogEntry *entry = log->current_entry;
 	uint v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	/* if it has a key, it shouldn't be NULL */
 	BLI_assert(!!BLI_ghash_lookup(entry->added_verts, key) ==
@@ -968,7 +968,7 @@ void BM_log_face_removed(BMLog *log, BMFace *f)
 {
 	BMLogEntry *entry = log->current_entry;
 	uint f_id = bm_log_face_id_get(log, f);
-	void *key = SET_UINT_IN_POINTER(f_id);
+	void *key = POINTER_FROM_UINT(f_id);
 
 	/* if it has a key, it shouldn't be NULL */
 	BLI_assert(!!BLI_ghash_lookup(entry->added_faces, key) ==
@@ -1040,7 +1040,7 @@ const float *BM_log_original_vert_co(BMLog *log, BMVert *v)
 	BMLogEntry *entry = log->current_entry;
 	const BMLogVert *lv;
 	unsigned v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	BLI_assert(entry);
 
@@ -1058,7 +1058,7 @@ const short *BM_log_original_vert_no(BMLog *log, BMVert *v)
 	BMLogEntry *entry = log->current_entry;
 	const BMLogVert *lv;
 	unsigned v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	BLI_assert(entry);
 
@@ -1076,7 +1076,7 @@ float BM_log_original_mask(BMLog *log, BMVert *v)
 	BMLogEntry *entry = log->current_entry;
 	const BMLogVert *lv;
 	unsigned v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	BLI_assert(entry);
 
@@ -1093,7 +1093,7 @@ void BM_log_original_vert_data(
 	BMLogEntry *entry = log->current_entry;
 	const BMLogVert *lv;
 	unsigned v_id = bm_log_vert_id_get(log, v);
-	void *key = SET_UINT_IN_POINTER(v_id);
+	void *key = POINTER_FROM_UINT(v_id);
 
 	BLI_assert(entry);
 
diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
index e6881f6d8b1..251a79e8ff5 100644
--- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c
+++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c
@@ -505,7 +505,7 @@ static LoopPairStore *bm_edgering_pair_store_create(
 			for (v_iter = lb->first, i = 0; v_iter; v_iter = v_iter->next, i++) {
 				BMVert *v = v_iter->data;
 				bm_vert_calc_surface_tangent(bm, v, nor[i]);
-				BLI_ghash_insert(nors_gh_iter, v, SET_UINT_IN_POINTER(i));
+				BLI_ghash_insert(nors_gh_iter, v, POINTER_FROM_UINT(i));
 			}
 		}
 
@@ -768,8 +768,8 @@ static void bm_edgering_pair_interpolate(
 				bm_vert_calc_surface_tangent(bm, v_b, no_b);
 #else
 				{
-					const uint index_a = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_a, v_a));
-					const uint index_b = GET_UINT_FROM_POINTER(BLI_ghash_lookup(lpair->nors_gh_b, v_b));
+					const uint index_a = POINTER_AS_UINT(BLI_ghash_lookup(lpair->nors_gh_a, v_a));
+					const uint index_b = POINTER_AS_UINT(BLI_ghash_lookup(lpair->nors_gh_b, v_b));
 
 					BLI_assert(BLI_ghash_haskey(lpair->nors_gh_a, v_a));
 					BLI_assert(BLI_ghash_haskey(lpair->nors_gh_b, v_b));
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);