blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

sculpt-dev: fix compile errors

This commit is contained in:
Joseph Eagar 2022-12-02 12:35:34 -08:00
parent e19d6d2f18
commit aeefe65171
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit c226f867affd12881533a54c8c90ac6eebfaca6c
Subproject commit 5a818af95080cccf04dfa8317f0e966bff515c64

10
source/blender/blenlib/intern/BLI_table_gset.c
View File

@ -100,7 +100,7 @@ bool BLI_table_gset_add(TableGSet *ts, void *elem)
bool ret = BLI_smallhash_ensure_p(PTR_TO_IDX(ts), (uintptr_t)elem, &val);
if (!ret) {
*val = ts->cur;
*val = POINTER_FROM_INT(ts->cur);
ts->elems[ts->cur++] = elem;
ts->length++;
@ -113,7 +113,7 @@ void BLI_table_gset_insert(TableGSet *ts, void *elem)
{
table_gset_resize(ts);
BLI_smallhash_insert(PTR_TO_IDX(ts), elem, (void *)ts->cur);
BLI_smallhash_insert(PTR_TO_IDX(ts), (uintptr_t)elem, (void *)ts->cur);
ts->elems[ts->cur++] = elem;
ts->length++;
@ -125,14 +125,14 @@ void BLI_table_gset_remove(TableGSet *ts, void *elem, GHashKeyFreeFP freefp)
return;
}
int *idx = (int *)BLI_smallhash_lookup_p(PTR_TO_IDX(ts), elem);
int *idx = (int *)BLI_smallhash_lookup_p(PTR_TO_IDX(ts), (uintptr_t)elem);
if (!idx) {
return;
}
int idx2 = *idx;
BLI_smallhash_remove(PTR_TO_IDX(ts), elem);
BLI_smallhash_remove(PTR_TO_IDX(ts), (uintptr_t)elem);
if (!ts->elems || ts->elems[idx2] != elem) {
return;
@ -144,7 +144,7 @@ void BLI_table_gset_remove(TableGSet *ts, void *elem, GHashKeyFreeFP freefp)
bool BLI_table_gset_haskey(TableGSet *ts, void *elem)
{
return BLI_smallhash_haskey(PTR_TO_IDX(ts), elem);
return BLI_smallhash_haskey(PTR_TO_IDX(ts), (uintptr_t)elem);
}
int BLI_table_gset_len(TableGSet *ts)

4
source/blender/blenlib/intern/smallhash.c
View File

@ -68,8 +68,8 @@
#endif
#define SMHASH_KEY_UNUSED (uintptr_t)(MAKE_ID_8('s', 'm', 'h', 'k', 'u', 'n', 'u', 's'))
#define SMHASH_CELL_FREE (uintptr_t)(MAKE_ID_8('s', 'm', 'h', 'c', 'f', 'r', 'e', 'e'))
#define SMHASH_CELL_UNUSED (uintptr_t)(MAKE_ID_8('s', 'm', 'h', 'c', 'u', 'n', 'u', 's'))
#define SMHASH_CELL_FREE (void *)(MAKE_ID_8('s', 'm', 'h', 'c', 'f', 'r', 'e', 'e'))
#define SMHASH_CELL_UNUSED (void *)(MAKE_ID_8('s', 'm', 'h', 'c', 'u', 'n', 'u', 's'))
#define USE_REMOVE