diff options
author | Geoffrey Bantle <hairbat@yahoo.com> | 2008-06-01 22:43:22 +0400 |
---|---|---|
committer | Geoffrey Bantle <hairbat@yahoo.com> | 2008-06-01 22:43:22 +0400 |
commit | 85e77e53ef29274d456ecfdb95ec2a60cb5253f1 (patch) | |
tree | bd167f47fe38a34c9c605fca3b641579c045d0b4 /source | |
parent | 33321d13d32a960be7e3aa7ee652ad4b23667d97 (diff) |
-> Fix for last few commits
New memory allocator broke compilation on
GCC/Linux. Fixed
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_bmesh.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/BME_structure.c | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h index ab2fd34cd42..e44e9e02aaa 100644 --- a/source/blender/blenkernel/BKE_bmesh.h +++ b/source/blender/blenkernel/BKE_bmesh.h @@ -53,8 +53,12 @@ struct BME_Poly; struct BME_Loop; -struct BME_mempool; -typedef struct BME_mempool BME_mempool; +/*structure for fast memory allocation/frees*/ +typedef struct BME_mempool{ + struct ListBase chunks; + int esize, csize, pchunk; /*size of elements and chunks in bytes and number of elements per chunk*/ + struct BME_freenode *free; /*free element list. Interleaved into chunk datas.*/ +}BME_mempool; /*Custom Data Types and defines Eventual plan is to move almost everything to custom data and let caller diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c index d261238d128..8f885d6c2cb 100644 --- a/source/blender/blenkernel/intern/BME_structure.c +++ b/source/blender/blenkernel/intern/BME_structure.c @@ -57,12 +57,6 @@ typedef struct BME_freenode{ struct BME_freenode *next; }BME_freenode; -typedef struct BME_mempool{ - struct ListBase chunks; - int esize, csize, pchunk; /*size of elements and chunks in bytes and number of elements per chunk*/ - struct BME_freenode *free; /*free element list. Interleaved into chunk datas.*/ -}BME_mempool; - BME_mempool *BME_mempool_create(int esize, int tote, int pchunk) { BME_mempool *pool = NULL; BME_freenode *lasttail = NULL, *curnode = NULL; |