minor edits and correcton to assert
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 09:14:09 +0000 (09:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 09:14:09 +0000 (09:14 +0000)
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/intern/customdata.c

index 0910fa0262c71c8934f78f0fc5ad34a92c6e4c57..4af19f7b0e7fd26a4d474c3d5ff9f0eef0b0a673 100644 (file)
@@ -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
index f3bb190541ae904c89c7e4fcd5e489207f805187..1678642a248458dd9349c8e53d585d7e7e7d5d78 100644 (file)
@@ -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;