Merge branch 'master' into blender2.8

4 files changed, 40 insertions, 40 deletions

diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index 902a9e7f14f..625df71bbf6 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -133,7 +133,7 @@ static Mesh *applyModifier(
 
 			for (j = 0; j < mp->totloop; j++, ml++) {
 				void **val_p;
-				if (!BLI_ghash_ensure_p(vertHash, SET_INT_IN_POINTER(ml->v), &val_p)) {
+				if (!BLI_ghash_ensure_p(vertHash, POINTER_FROM_INT(ml->v), &val_p)) {
 					*val_p = (void *)hash_num;
 					hash_num++;
 				}
@@ -151,8 +151,8 @@ static Mesh *applyModifier(
 		for (i = 0; i < numEdge_src; i++, hash_num_alt++) {
 			MEdge *me = medge_src + i;
 
-			if (BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me->v1)) &&
-			    BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me->v2)))
+			if (BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v1)) &&
+			    BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v2)))
 			{
 				BLI_ghash_insert(edgeHash, (void *)hash_num, (void *)hash_num_alt);
 				BLI_ghash_insert(edgeHash2, (void *)hash_num_alt, (void *)hash_num);
@@ -179,11 +179,11 @@ static Mesh *applyModifier(
 			void **val_p;
 			me = medge + edgeMap[i];
 
-			if (!BLI_ghash_ensure_p(vertHash, SET_INT_IN_POINTER(me->v1), &val_p)) {
+			if (!BLI_ghash_ensure_p(vertHash, POINTER_FROM_INT(me->v1), &val_p)) {
 				*val_p = (void *)hash_num;
 				hash_num++;
 			}
-			if (!BLI_ghash_ensure_p(vertHash, SET_INT_IN_POINTER(me->v2), &val_p)) {
+			if (!BLI_ghash_ensure_p(vertHash, POINTER_FROM_INT(me->v2), &val_p)) {
 				*val_p = (void *)hash_num;
 				hash_num++;
 			}
@@ -194,10 +194,10 @@ static Mesh *applyModifier(
 		for (i = 0; i < numEdges_dst; i++) {
 			j = BLI_ghash_len(edgeHash);
 
-			BLI_ghash_insert(edgeHash, SET_INT_IN_POINTER(j),
-			                 SET_INT_IN_POINTER(edgeMap[i]));
-			BLI_ghash_insert(edgeHash2,  SET_INT_IN_POINTER(edgeMap[i]),
-			                 SET_INT_IN_POINTER(j));
+			BLI_ghash_insert(edgeHash, POINTER_FROM_INT(j),
+			                 POINTER_FROM_INT(edgeMap[i]));
+			BLI_ghash_insert(edgeHash2,  POINTER_FROM_INT(edgeMap[i]),
+			                 POINTER_FROM_INT(j));
 		}
 	}
 	else {
@@ -212,7 +212,7 @@ static Mesh *applyModifier(
 		 * mapped to the new indices
 		 */
 		for (i = 0; i < numVerts; i++) {
-			BLI_ghash_insert(vertHash, SET_INT_IN_POINTER(vertMap[i]), SET_INT_IN_POINTER(i));
+			BLI_ghash_insert(vertHash, POINTER_FROM_INT(vertMap[i]), POINTER_FROM_INT(i));
 		}
 	}
 
@@ -225,8 +225,8 @@ static Mesh *applyModifier(
 	GHASH_ITER (gh_iter, vertHash) {
 		MVert source;
 		MVert *dest;
-		int oldIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter));
-		int newIndex = GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter));
+		int oldIndex = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter));
+		int newIndex = POINTER_AS_INT(BLI_ghashIterator_getValue(&gh_iter));
 
 		source = mvert_src[oldIndex];
 		dest = &result->mvert[newIndex];
@@ -239,13 +239,13 @@ static Mesh *applyModifier(
 	for (i = 0; i < BLI_ghash_len(edgeHash); i++) {
 		MEdge source;
 		MEdge *dest;
-		int oldIndex = GET_INT_FROM_POINTER(BLI_ghash_lookup(edgeHash, SET_INT_IN_POINTER(i)));
+		int oldIndex = POINTER_AS_INT(BLI_ghash_lookup(edgeHash, POINTER_FROM_INT(i)));
 
 		source = medge_src[oldIndex];
 		dest = &result->medge[i];
 
-		source.v1 = GET_INT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_INT_IN_POINTER(source.v1)));
-		source.v2 = GET_INT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_INT_IN_POINTER(source.v2)));
+		source.v1 = POINTER_AS_INT(BLI_ghash_lookup(vertHash, POINTER_FROM_INT(source.v1)));
+		source.v2 = POINTER_AS_INT(BLI_ghash_lookup(vertHash, POINTER_FROM_INT(source.v2)));
 
 		CustomData_copy_data(&mesh->edata, &result->edata, oldIndex, i, 1);
 		*dest = source;
@@ -270,8 +270,8 @@ static Mesh *applyModifier(
 
 		ml_src = mloop_src + source->loopstart;
 		for (j = 0; j < source->totloop; j++, k++, ml_src++, ml_dst++) {
-			ml_dst->v = GET_INT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_INT_IN_POINTER(ml_src->v)));
-			ml_dst->e = GET_INT_FROM_POINTER(BLI_ghash_lookup(edgeHash2, SET_INT_IN_POINTER(ml_src->e)));
+			ml_dst->v = POINTER_AS_INT(BLI_ghash_lookup(vertHash, POINTER_FROM_INT(ml_src->v)));
+			ml_dst->e = POINTER_AS_INT(BLI_ghash_lookup(edgeHash2, POINTER_FROM_INT(ml_src->e)));
 		}
 	}
 
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 04bfe96bc59..7c38677ba8b 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -191,7 +191,7 @@ static void createFacepa(
 
 static int edgecut_get(EdgeHash *edgehash, unsigned int v1, unsigned int v2)
 {
-	return GET_INT_FROM_POINTER(BLI_edgehash_lookup(edgehash, v1, v2));
+	return POINTER_AS_INT(BLI_edgehash_lookup(edgehash, v1, v2));
 }
 
 
@@ -628,7 +628,7 @@ static DerivedMesh *cutEdges(ExplodeModifierData *emd, DerivedMesh *dm)
 	ehi = BLI_edgehashIterator_new(edgehash);
 	totesplit = totvert;
 	for (; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
-		BLI_edgehashIterator_setValue(ehi, SET_INT_IN_POINTER(totesplit));
+		BLI_edgehashIterator_setValue(ehi, POINTER_FROM_INT(totesplit));
 		totesplit++;
 	}
 	BLI_edgehashIterator_free(ehi);
@@ -667,7 +667,7 @@ static DerivedMesh *cutEdges(ExplodeModifierData *emd, DerivedMesh *dm)
 	ehi = BLI_edgehashIterator_new(edgehash);
 	for (; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
 		BLI_edgehashIterator_getKey(ehi, &ed_v1, &ed_v2);
-		esplit = GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
+		esplit = POINTER_AS_INT(BLI_edgehashIterator_getValue(ehi));
 		mv = CDDM_get_vert(splitdm, ed_v2);
 		dupve = CDDM_get_vert(splitdm, esplit);
 
@@ -862,7 +862,7 @@ static DerivedMesh *explodeMesh(
 	/* make new vertice indexes & count total vertices after duplication */
 	ehi = BLI_edgehashIterator_new(vertpahash);
 	for (; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
-		BLI_edgehashIterator_setValue(ehi, SET_INT_IN_POINTER(totdup));
+		BLI_edgehashIterator_setValue(ehi, POINTER_FROM_INT(totdup));
 		totdup++;
 	}
 	BLI_edgehashIterator_free(ehi);
@@ -886,7 +886,7 @@ static DerivedMesh *explodeMesh(
 		/* get particle + vertex from hash */
 		BLI_edgehashIterator_getKey(ehi, &ed_v1, &ed_v2);
 		ed_v2 -= totvert;
-		v = GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
+		v = POINTER_AS_INT(BLI_edgehashIterator_getValue(ehi));
 
 		dm->getVert(dm, ed_v1, &source);
 		dest = CDDM_get_vert(explode, v);
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c
index fd833a2a322..401a082f45c 100644
--- a/source/blender/modifiers/intern/MOD_mask.c
+++ b/source/blender/modifiers/intern/MOD_mask.c
@@ -196,7 +196,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 			}
 
 			/* add to ghash for verts (numVerts acts as counter for mapping) */
-			BLI_ghash_insert(vertHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numVerts));
+			BLI_ghash_insert(vertHash, POINTER_FROM_INT(i), POINTER_FROM_INT(numVerts));
 			numVerts++;
 		}
 
@@ -222,7 +222,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 			}
 
 			/* add to ghash for verts (numVerts acts as counter for mapping) */
-			BLI_ghash_insert(vertHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numVerts));
+			BLI_ghash_insert(vertHash, POINTER_FROM_INT(i), POINTER_FROM_INT(numVerts));
 			numVerts++;
 		}
 	}
@@ -246,10 +246,10 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 		const MEdge *me = &medge_src[i];
 
 		/* only add if both verts will be in new mesh */
-		if (BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me->v1)) &&
-		    BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(me->v2)))
+		if (BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v1)) &&
+		    BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v2)))
 		{
-			BLI_ghash_insert(edgeHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numEdges));
+			BLI_ghash_insert(edgeHash, POINTER_FROM_INT(i), POINTER_FROM_INT(numEdges));
 			numEdges++;
 		}
 	}
@@ -260,7 +260,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 		int j;
 
 		for (j = 0; j < mp_src->totloop; j++, ml_src++) {
-			if (!BLI_ghash_haskey(vertHash, SET_INT_IN_POINTER(ml_src->v))) {
+			if (!BLI_ghash_haskey(vertHash, POINTER_FROM_INT(ml_src->v))) {
 				ok = false;
 				break;
 			}
@@ -268,7 +268,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 
 		/* all verts must be available */
 		if (ok) {
-			BLI_ghash_insert(polyHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numPolys));
+			BLI_ghash_insert(polyHash, POINTER_FROM_INT(i), POINTER_FROM_INT(numPolys));
 			loop_mapping[numPolys] = numLoops;
 			numPolys++;
 			numLoops += mp_src->totloop;
@@ -291,8 +291,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 	GHASH_ITER (gh_iter, vertHash) {
 		const MVert *v_src;
 		MVert *v_dst;
-		const int i_src = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter));
-		const int i_dst = GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter));
+		const int i_src = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter));
+		const int i_dst = POINTER_AS_INT(BLI_ghashIterator_getValue(&gh_iter));
 
 		v_src = &mvert_src[i_src];
 		v_dst = &mvert_dst[i_dst];
@@ -305,22 +305,22 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 	GHASH_ITER (gh_iter, edgeHash) {
 		const MEdge *e_src;
 		MEdge *e_dst;
-		const int i_src = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter));
-		const int i_dst = GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter));
+		const int i_src = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter));
+		const int i_dst = POINTER_AS_INT(BLI_ghashIterator_getValue(&gh_iter));
 
 		e_src = &medge_src[i_src];
 		e_dst = &medge_dst[i_dst];
 
 		CustomData_copy_data(&mesh->edata, &result->edata, i_src, i_dst, 1);
 		*e_dst = *e_src;
-		e_dst->v1 = GET_UINT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_UINT_IN_POINTER(e_src->v1)));
-		e_dst->v2 = GET_UINT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_UINT_IN_POINTER(e_src->v2)));
+		e_dst->v1 = POINTER_AS_UINT(BLI_ghash_lookup(vertHash, POINTER_FROM_UINT(e_src->v1)));
+		e_dst->v2 = POINTER_AS_UINT(BLI_ghash_lookup(vertHash, POINTER_FROM_UINT(e_src->v2)));
 	}
 
 	/* faces */
 	GHASH_ITER (gh_iter, polyHash) {
-		const int i_src = GET_INT_FROM_POINTER(BLI_ghashIterator_getKey(&gh_iter));
-		const int i_dst = GET_INT_FROM_POINTER(BLI_ghashIterator_getValue(&gh_iter));
+		const int i_src = POINTER_AS_INT(BLI_ghashIterator_getKey(&gh_iter));
+		const int i_dst = POINTER_AS_INT(BLI_ghashIterator_getValue(&gh_iter));
 		const MPoly *mp_src = &mpoly_src[i_src];
 		MPoly *mp_dst = &mpoly_dst[i_dst];
 		const int i_ml_src = mp_src->loopstart;
@@ -334,8 +334,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
 		*mp_dst = *mp_src;
 		mp_dst->loopstart = i_ml_dst;
 		for (i = 0; i < mp_src->totloop; i++) {
-			ml_dst[i].v = GET_UINT_FROM_POINTER(BLI_ghash_lookup(vertHash, SET_UINT_IN_POINTER(ml_src[i].v)));
-			ml_dst[i].e = GET_UINT_FROM_POINTER(BLI_ghash_lookup(edgeHash, SET_UINT_IN_POINTER(ml_src[i].e)));
+			ml_dst[i].v = POINTER_AS_UINT(BLI_ghash_lookup(vertHash, POINTER_FROM_UINT(ml_src[i].v)));
+			ml_dst[i].e = POINTER_AS_UINT(BLI_ghash_lookup(edgeHash, POINTER_FROM_UINT(ml_src[i].e)));
 		}
 	}
 
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c
index 19b3c2ca745..78a994a7107 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.c
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.c
@@ -241,7 +241,7 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd, Weight
 
 				if (!(lnor_space->flags & MLNOR_SPACE_IS_SINGLE)) {
 					for (LinkNode *lnode = lnor_space->loops; lnode; lnode = lnode->next) {
-						const int ml_fan_index = GET_INT_FROM_POINTER(lnode->link);
+						const int ml_fan_index = POINTER_AS_INT(lnode->link);
 						BLI_BITMAP_ENABLE(done_loops, ml_fan_index);
 					}
 				}