[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42914] branches/bmesh/blender/source/ blender/blenkernel: minor edits and correcton to assert

[Campbell Barton]

Revision: 42914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42914
Author:   campbellbarton
Date:     2011-12-28 09:14:09 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
minor edits and correcton to assert

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
    branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h	2011-12-28 09:11:11 UTC (rev 42913)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h	2011-12-28 09:14:09 UTC (rev 42914)
@@ -182,8 +182,8 @@
 							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

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-12-28 09:11:11 UTC (rev 42913)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-12-28 09:14:09 UTC (rev 42914)
@@ -1138,6 +1138,7 @@
 	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 @@
 	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;