code cleanup: warnings

This commit is contained in:
Campbell Barton
2013-02-04 16:20:39 +00:00
parent 03687b7c66
commit 9d713688ba
3 changed files with 6 additions and 2 deletions

View File

@@ -828,7 +828,7 @@ void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int interpola
return; return;
float time = 0.0f; float time = 0.0f;
float prevtime = 0.0f; // float prevtime = 0.0f; // UNUSED
int vertexindex = vert_offset; int vertexindex = vert_offset;
@@ -865,7 +865,7 @@ void ExportCurveTriangleVcol(Mesh *mesh, ParticleCurveData *CData, int interpola
} }
} }
prevtime = time; // prevtime = time; // UNUSED
} }
} }
} }

View File

@@ -1242,12 +1242,15 @@ void CustomData_update_typemap(CustomData *data)
} }
} }
/* currently only used in BLI_assert */
#ifndef NDEBUG
static int customdata_typemap_is_valid(const CustomData *data) static int customdata_typemap_is_valid(const CustomData *data)
{ {
CustomData data_copy = *data; CustomData data_copy = *data;
CustomData_update_typemap(&data_copy); CustomData_update_typemap(&data_copy);
return (memcmp(data->typemap, data_copy.typemap, sizeof(data->typemap)) == 0); return (memcmp(data->typemap, data_copy.typemap, sizeof(data->typemap)) == 0);
} }
#endif
void CustomData_merge(const struct CustomData *source, struct CustomData *dest, void CustomData_merge(const struct CustomData *source, struct CustomData *dest,
CustomDataMask mask, int alloctype, int totelem) CustomDataMask mask, int alloctype, int totelem)

View File

@@ -384,6 +384,7 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid,
int iret; int iret;
BLI_assert(f1 != NULL && f2 != NULL); BLI_assert(f1 != NULL && f2 != NULL);
(void)f1, (void)f2; /* UNUSED */
/* get direction vectors for two offset lines */ /* get direction vectors for two offset lines */
sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co); sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co);