merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though...
[blender-staging.git] / source / blender / blenkernel / intern / BME_Customdata.c
index ea149e03959141b03e26f56ae90b7305d3f64bb6..fa6d19f7751b715891099bd8085b53c231665acc 100644 (file)
@@ -22,7 +22,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) 2004 Blender Foundation.
  * All rights reserved.
@@ -83,8 +83,8 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
        /*alloc our layers*/
        if(data->totlayer){
                /*alloc memory*/
-               data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
-               data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc);
+               data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers", 1);
+               data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc, 1);
                /*initialize layer data*/
                for(i=0; i < BME_CD_NUMTYPES; i++){
                        if(init->layout[i]){