diff options
| author | Ken Hughes <khughes@pacific.edu> | 2008-04-18 04:21:40 +0400 |
|---|---|---|
| committer | Ken Hughes <khughes@pacific.edu> | 2008-04-18 04:21:40 +0400 |
| commit | 60de9d9b2f748381e35bb4f73351f7293292d78a (patch) | |
| tree | 01483a6fe893243363418d025b6532c2310128ec /source/blender/src/editface.c | |
| parent | be0b8ccfaaa98118468c8fec971792ab1123eaca (diff) | |
More changes to GET_INT_FROM_POINTER and SET_INT_IN_POINTER to get rid of
other warnings that only occurred with 64bit systems. Wish I'd known about
these macros earlier!
Diffstat (limited to 'source/blender/src/editface.c')
| -rw-r--r-- | source/blender/src/editface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c index b9d3a7b1b11..c1665332be8 100644 --- a/source/blender/src/editface.c +++ b/source/blender/src/editface.c @@ -908,7 +908,7 @@ static void seam_add_adjacent(Mesh *me, Heap *heap, int mednum, int vertnum, int if (cost[adjnum] > newcost) { cost[adjnum] = newcost; prevedge[adjnum] = mednum; - BLI_heap_insert(heap, newcost, (void*)adjnum); + BLI_heap_insert(heap, newcost, SET_INT_IN_POINTER(adjnum)); } } } @@ -973,11 +973,11 @@ static int seam_shortest_path(Mesh *me, int source, int target) /* regular dijkstra shortest path, but over edges instead of vertices */ heap = BLI_heap_new(); - BLI_heap_insert(heap, 0.0f, (void*)source); + BLI_heap_insert(heap, 0.0f, SET_INT_IN_POINTER(source)); cost[source] = 0.0f; while (!BLI_heap_empty(heap)) { - mednum = (int)BLI_heap_popmin(heap); + mednum = GET_INT_FROM_POINTER(BLI_heap_popmin(heap)); med = me->medge + mednum; if (mednum == target) |