Revision: 15083
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15083
Author:   briggs
Date:     2008-06-01 20:43:22 +0200 (Sun, 01 Jun 2008)

Log Message:
-----------
-> Fix for last few commits

New memory allocator broke compilation on
GCC/Linux. Fixed

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_bmesh.h
    trunk/blender/source/blender/blenkernel/intern/BME_structure.c

Modified: trunk/blender/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_bmesh.h 2008-06-01 18:02:29 UTC 
(rev 15082)
+++ trunk/blender/source/blender/blenkernel/BKE_bmesh.h 2008-06-01 18:43:22 UTC 
(rev 15083)
@@ -53,8 +53,12 @@
 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

Modified: trunk/blender/source/blender/blenkernel/intern/BME_structure.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_structure.c      
2008-06-01 18:02:29 UTC (rev 15082)
+++ trunk/blender/source/blender/blenkernel/intern/BME_structure.c      
2008-06-01 18:43:22 UTC (rev 15083)
@@ -57,12 +57,6 @@
        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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to