diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-03-09 07:32:40 +0300 |
| commit | 71003b9bcc88ecf6138c3debb9abba4637c8e61a (patch) | |
| tree | 7f85d40231311a36a72f731a7c07b8dbd6fff577 /source/blender/blenkernel/intern/BME_mesh.c | |
| parent | ea540496c8281dcba899fb6b29c1bcfbb53a0482 (diff) | |
| parent | 790d6ca256e6b572826b2bf214c6fd6c8a623969 (diff) | |
merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge
Diffstat (limited to 'source/blender/blenkernel/intern/BME_mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/BME_mesh.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/BME_mesh.c b/source/blender/blenkernel/intern/BME_mesh.c index f635cfcfcd2..f1f9f27031b 100644 --- a/source/blender/blenkernel/intern/BME_mesh.c +++ b/source/blender/blenkernel/intern/BME_mesh.c @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * The Original Code is Copyright (C) 2007 Blender Foundation. * All rights reserved. @@ -55,10 +55,10 @@ BME_Mesh *BME_make_mesh(int allocsize[4]) /*allocate the structure*/ BME_Mesh *bm = MEM_callocN(sizeof(BME_Mesh),"BMesh"); /*allocate the memory pools for the mesh elements*/ - bm->vpool = BLI_mempool_create(sizeof(BME_Vert), allocsize[0], allocsize[0]); - bm->epool = BLI_mempool_create(sizeof(BME_Edge), allocsize[1], allocsize[1]); - bm->lpool = BLI_mempool_create(sizeof(BME_Loop), allocsize[2], allocsize[2]); - bm->ppool = BLI_mempool_create(sizeof(BME_Poly), allocsize[3], allocsize[3]); + bm->vpool = BLI_mempool_create(sizeof(BME_Vert), allocsize[0], allocsize[0], 1); + bm->epool = BLI_mempool_create(sizeof(BME_Edge), allocsize[1], allocsize[1], 1); + bm->lpool = BLI_mempool_create(sizeof(BME_Loop), allocsize[2], allocsize[2], 1); + bm->ppool = BLI_mempool_create(sizeof(BME_Poly), allocsize[3], allocsize[3], 1); return bm; } /* |