From 62ca0e07dad7d79c79eda2c3eeef0afd7e939896 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 3 Jun 2008 10:04:42 +0000 Subject: [PATCH] A few compiler warning fixes. Those in BME_customdata.c were more serious. --- source/blender/blenkernel/intern/BME_Customdata.c | 3 ++- source/blender/src/editmesh_tools.c | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c index 68bc75327d9..8b48efbdbd2 100644 --- a/source/blender/blenkernel/intern/BME_Customdata.c +++ b/source/blender/blenkernel/intern/BME_Customdata.c @@ -39,6 +39,7 @@ #include "BKE_bmeshCustomData.h" #include "bmesh_private.h" #include +#include "MEM_guardedalloc.h" /********************* Layer type information **********************/ typedef struct BME_LayerTypeInfo { @@ -88,7 +89,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc if(init->layout[i]){ info = BME_layerType_getInfo(i); for(j=0; j < init->layout[i]; j++){ - if(j=0) data->layers[j+i].active = init->active[i]; + if(j==0) data->layers[j+i].active = init->active[i]; data->layers[j+i].type = i; data->layers[j+i].offset = offset; strcpy(data->layers[j+i].name, &(init->nametemplate[j+i])); diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index f85161c3e23..f9bb14a08c6 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -4480,11 +4480,6 @@ static void bevel_mesh_recurs(float bsize, short recurs, int allfaces) } void bevel_menu() { - int vlayers[BME_CD_NUMTYPES] = {0,0,0,0}; - int elayers[BME_CD_NUMTYPES] = {0,0,0,0}; - int llayers[BME_CD_NUMTYPES] = {0,0,0,0}; - int players[BME_CD_NUMTYPES] = {0,0,0,0}; - BME_Mesh *bm; BME_TransData_Head *td; TransInfo *t;