diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 13:14:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 13:14:09 +0400 |
commit | 5d46acd59fb1efb1b439f8a982c515ba7ad864d5 (patch) | |
tree | 50b966fc8d39b44e8e685c57165ca3636d114dd1 | |
parent | 317b3c7f3fc70b34bb43bb8a1fafd42c4f84c08b (diff) |
minor edits and correcton to assert
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 0910fa0262c..4af19f7b0e7 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -182,8 +182,8 @@ void CustomData_em_copy_data(const struct CustomData *source, struct CustomData *dest, void *src_block, void **dest_block); void CustomData_bmesh_copy_data(const struct CustomData *source, - struct CustomData *dest, void *src_block, - void **dest_block); + struct CustomData *dest, void *src_block, + void **dest_block); void CustomData_em_validate_data(struct CustomData *data, void *block, int sub_elements); /* frees data in a CustomData object diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index f3bb190541a..1678642a248 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1138,6 +1138,7 @@ const CustomDataMask CD_MASK_FACECORNERS = CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL; + static const LayerTypeInfo *layerType_getInfo(int type) { if(type < 0 || type >= CD_NUMTYPES) return NULL; @@ -1163,7 +1164,7 @@ void CustomData_update_typemap(CustomData *data) int i, lasttype = -1; /* since we cant do in a pre-processor do here as an assert */ - BLI_assert(sizeof(data->typemap) / sizeof(int) <= CD_NUMTYPES); + BLI_assert(sizeof(data->typemap) / sizeof(int) >= CD_NUMTYPES); for (i=0; i<CD_NUMTYPES; i++) { data->typemap[i] = -1; |