diff options
author | omnisci3nce <omniscient.oce@gmail.com> | 2024-04-27 13:08:03 +1000 |
---|---|---|
committer | omnisci3nce <omniscient.oce@gmail.com> | 2024-04-27 13:08:03 +1000 |
commit | 4cbc38b92edaa331fd0f6a077bbe7d7aebdb9ecf (patch) | |
tree | 753d23b07b09e3494e4cce594bd4b0f4710566f8 /src/std/mem.c | |
parent | d6837defc03e431517f6616ec8e49a8eb3643011 (diff) | |
parent | c7c33cd18e057bc826a0d31e1860b0ac396a00b6 (diff) |
Merge remote-tracking branch 'origin/cel-67-load-animation-data-from-gltf' into ral
Diffstat (limited to 'src/std/mem.c')
-rw-r--r-- | src/std/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/std/mem.c b/src/std/mem.c index 00f9c39..5468898 100644 --- a/src/std/mem.c +++ b/src/std/mem.c @@ -15,7 +15,7 @@ void* arena_alloc_align(arena* a, size_t size, size_t align) { if (available < 0 || (ptrdiff_t)size > available) { ERROR_EXIT("Arena ran out of memory\n"); } - void* p = a->begin + padding; + void* p = a->curr + padding; a->curr += padding + size; return memset(p, 0, size); } |