blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Geometry Nodes: add simulation support #104924

Closed
Hans Goudey wants to merge 211 commits from geometry-nodes-simulation into main
pull from: geometry-nodes-simulation
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 14 Commits 211 Files Changed 65 +6 -2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ab7e005e0 - Show all commits

8
source/blender/blenlib/intern/BLI_mempool.c
View File

@ -150,6 +150,8 @@ static void mempool_asan_unlock(BLI_mempool *pool)
{
#ifdef WITH_ASAN
BLI_mutex_unlock(&pool->mutex);
#else
UNUSED_VARS(pool);
#endif
}
@ -157,6 +159,8 @@ static void mempool_asan_lock(BLI_mempool *pool)
{
#ifdef WITH_ASAN
BLI_mutex_lock(&pool->mutex);
#else
UNUSED_VARS(pool);
#endif
}
@ -510,7 +514,7 @@ void BLI_mempool_free(BLI_mempool *pool, void *addr)
int BLI_mempool_len(const BLI_mempool *pool)
{
int ret = pool->totused;
int ret = (int)pool->totused;
return ret;
}
@ -552,7 +556,7 @@ void BLI_mempool_as_table(BLI_mempool *pool, void **data)
*p++ = elem;
}
BLI_assert((int)(p - data) == pool->totused);
BLI_assert((int)(p - data) == (int)pool->totused);
}
void **BLI_mempool_as_tableN(BLI_mempool *pool, const char *allocstr)