Merge branch 'master' into blender2.8

1 files changed, 18 insertions, 18 deletions

diff --git a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c
index b378744fa7a..f81a1d9eec9 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_opensubdiv_converter.c
@@ -584,7 +584,7 @@ static int conv_ccg_get_num_face_verts(const OpenSubdiv_Converter *converter,
                                        int face)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGFace *ccg_face = ccgSubSurf_getFace(ss, SET_INT_IN_POINTER(face));
+	CCGFace *ccg_face = ccgSubSurf_getFace(ss, POINTER_FROM_INT(face));
 	return ccgSubSurf_getFaceNumVerts(ccg_face);
 }
 
@@ -593,12 +593,12 @@ static void conv_ccg_get_face_verts(const OpenSubdiv_Converter *converter,
                                     int *face_verts)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGFace *ccg_face = ccgSubSurf_getFace(ss, SET_INT_IN_POINTER(face));
+	CCGFace *ccg_face = ccgSubSurf_getFace(ss, POINTER_FROM_INT(face));
 	int num_face_verts = ccgSubSurf_getFaceNumVerts(ccg_face);
 	int loop;
 	for (loop = 0; loop < num_face_verts; loop++) {
 		CCGVert *ccg_vert = ccgSubSurf_getFaceVert(ccg_face, loop);
-		face_verts[loop] = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(ccg_vert));
+		face_verts[loop] = POINTER_AS_INT(ccgSubSurf_getVertVertHandle(ccg_vert));
 	}
 }
 
@@ -607,12 +607,12 @@ static void conv_ccg_get_face_edges(const OpenSubdiv_Converter *converter,
                                     int *face_edges)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGFace *ccg_face = ccgSubSurf_getFace(ss, SET_INT_IN_POINTER(face));
+	CCGFace *ccg_face = ccgSubSurf_getFace(ss, POINTER_FROM_INT(face));
 	int num_face_verts = ccgSubSurf_getFaceNumVerts(ccg_face);
 	int loop;
 	for (loop = 0; loop < num_face_verts; loop++) {
 		CCGEdge *ccg_edge = ccgSubSurf_getFaceEdge(ccg_face, loop);
-		face_edges[loop] = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ccg_edge));
+		face_edges[loop] = POINTER_AS_INT(ccgSubSurf_getEdgeEdgeHandle(ccg_edge));
 	}
 }
 
@@ -621,18 +621,18 @@ static void conv_ccg_get_edge_verts(const OpenSubdiv_Converter *converter,
                                     int *edge_verts)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, SET_INT_IN_POINTER(edge));
+	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, POINTER_FROM_INT(edge));
 	CCGVert *ccg_vert0 = ccgSubSurf_getEdgeVert0(ccg_edge);
 	CCGVert *ccg_vert1 = ccgSubSurf_getEdgeVert1(ccg_edge);
-	edge_verts[0] = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(ccg_vert0));
-	edge_verts[1] = GET_INT_FROM_POINTER(ccgSubSurf_getVertVertHandle(ccg_vert1));
+	edge_verts[0] = POINTER_AS_INT(ccgSubSurf_getVertVertHandle(ccg_vert0));
+	edge_verts[1] = POINTER_AS_INT(ccgSubSurf_getVertVertHandle(ccg_vert1));
 }
 
 static int conv_ccg_get_num_edge_faces(const OpenSubdiv_Converter *converter,
                                        int edge)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, SET_INT_IN_POINTER(edge));
+	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, POINTER_FROM_INT(edge));
 	return ccgSubSurf_getEdgeNumFaces(ccg_edge);
 }
 
@@ -641,12 +641,12 @@ static void conv_ccg_get_edge_faces(const OpenSubdiv_Converter *converter,
                                     int *edge_faces)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, SET_INT_IN_POINTER(edge));
+	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, POINTER_FROM_INT(edge));
 	int num_edge_faces = ccgSubSurf_getEdgeNumFaces(ccg_edge);
 	int face;
 	for (face = 0; face < num_edge_faces; face++) {
 		CCGFace *ccg_face = ccgSubSurf_getEdgeFace(ccg_edge, face);
-		edge_faces[face] = GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(ccg_face));
+		edge_faces[face] = POINTER_AS_INT(ccgSubSurf_getFaceFaceHandle(ccg_face));
 	}
 }
 
@@ -654,7 +654,7 @@ static float conv_ccg_get_edge_sharpness(const OpenSubdiv_Converter *converter,
                                          int edge)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, SET_INT_IN_POINTER(edge));
+	CCGEdge *ccg_edge = ccgSubSurf_getEdge(ss, POINTER_FROM_INT(edge));
 	/* TODO(sergey): Multiply by subdivision level once CPU evaluator
 	 * is switched to uniform subdivision type.
 	 */
@@ -665,7 +665,7 @@ static int conv_ccg_get_num_vert_edges(const OpenSubdiv_Converter *converter,
                                        int vert)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, SET_INT_IN_POINTER(vert));
+	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, POINTER_FROM_INT(vert));
 	return ccgSubSurf_getVertNumEdges(ccg_vert);
 }
 
@@ -674,12 +674,12 @@ static void conv_ccg_get_vert_edges(const OpenSubdiv_Converter *converter,
                                     int *vert_edges)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, SET_INT_IN_POINTER(vert));
+	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, POINTER_FROM_INT(vert));
 	int num_vert_edges = ccgSubSurf_getVertNumEdges(ccg_vert);
 	int edge;
 	for (edge = 0; edge < num_vert_edges; edge++) {
 		CCGEdge *ccg_edge = ccgSubSurf_getVertEdge(ccg_vert, edge);
-		vert_edges[edge] = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ccg_edge));
+		vert_edges[edge] = POINTER_AS_INT(ccgSubSurf_getEdgeEdgeHandle(ccg_edge));
 	}
 }
 
@@ -687,7 +687,7 @@ static int conv_ccg_get_num_vert_faces(const OpenSubdiv_Converter *converter,
                                        int vert)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, SET_INT_IN_POINTER(vert));
+	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, POINTER_FROM_INT(vert));
 	return ccgSubSurf_getVertNumFaces(ccg_vert);
 }
 
@@ -696,12 +696,12 @@ static void conv_ccg_get_vert_faces(const OpenSubdiv_Converter *converter,
                                     int *vert_faces)
 {
 	CCGSubSurf *ss = converter->user_data;
-	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, SET_INT_IN_POINTER(vert));
+	CCGVert *ccg_vert = ccgSubSurf_getVert(ss, POINTER_FROM_INT(vert));
 	int num_vert_faces = ccgSubSurf_getVertNumFaces(ccg_vert);
 	int face;
 	for (face = 0; face < num_vert_faces; face++) {
 		CCGFace *ccg_face = ccgSubSurf_getVertFace(ccg_vert, face);
-		vert_faces[face] = GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(ccg_face));
+		vert_faces[face] = POINTER_AS_INT(ccgSubSurf_getFaceFaceHandle(ccg_face));
 	}
 }