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/booleanops.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/booleanops.c')
| -rw-r--r-- | source/blender/src/booleanops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/booleanops.c b/source/blender/src/booleanops.c index 4c9e594b5f9..14766d1f746 100644 --- a/source/blender/src/booleanops.c +++ b/source/blender/src/booleanops.c @@ -396,10 +396,10 @@ static DerivedMesh *ConvertCSGDescriptorsToDerivedMesh( if (!BLI_ghash_haskey(material_hash, orig_mat)) { mat[*totmat] = orig_mat; mat_nr = mface->mat_nr = (*totmat)++; - BLI_ghash_insert(material_hash, orig_mat, (void*)mat_nr); + BLI_ghash_insert(material_hash, orig_mat, SET_INT_IN_POINTER(mat_nr)); } else - mface->mat_nr = (int)BLI_ghash_lookup(material_hash, orig_mat); + mface->mat_nr = GET_INT_FROM_POINTER(BLI_ghash_lookup(material_hash, orig_mat)); } else mface->mat_nr = 0; |