archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

More changes to GET_INT_FROM_POINTER and SET_INT_IN_POINTER to get rid of

Browse Source 
other warnings that only occurred with 64bit systems.  Wish I'd known about
these macros earlier!
This commit is contained in:
Ken Hughes
2008-04-18 00:21:40 +00:00
parent be0b8ccfaa
commit 60de9d9b2f
6 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/src/booleanops.c
View File

@@ -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;