[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42910] trunk/blender/source/blender/ makesdna: minor changes from bmesh into trunk

[Campbell Barton]

Revision: 42910
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42910
Author:   campbellbarton
Date:     2011-12-28 08:29:03 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
minor changes from bmesh into trunk

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_customdata_types.h
    trunk/blender/source/blender/makesdna/DNA_meshdata_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_customdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2011-12-28 07:43:06 UTC (rev 42909)
+++ trunk/blender/source/blender/makesdna/DNA_customdata_types.h	2011-12-28 08:29:03 UTC (rev 42910)
@@ -75,7 +75,7 @@
 #define CD_MCOL			6
 #define CD_ORIGINDEX	7
 #define CD_NORMAL		8
-#define CD_FLAGS		9
+#define CD_POLYINDEX	9
 #define CD_PROP_FLT		10
 #define CD_PROP_INT		11
 #define CD_PROP_STR		12
@@ -103,7 +103,7 @@
 #define CD_MASK_MCOL		(1 << CD_MCOL)
 #define CD_MASK_ORIGINDEX	(1 << CD_ORIGINDEX)
 #define CD_MASK_NORMAL		(1 << CD_NORMAL)
-#define CD_MASK_FLAGS		(1 << CD_FLAGS)
+#define CD_MASK_POLYINDEX	(1 << CD_POLYINDEX)
 #define CD_MASK_PROP_FLT	(1 << CD_PROP_FLT)
 #define CD_MASK_PROP_INT	(1 << CD_PROP_INT)
 #define CD_MASK_PROP_STR	(1 << CD_PROP_STR)

Modified: trunk/blender/source/blender/makesdna/DNA_meshdata_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-28 07:43:06 UTC (rev 42909)
+++ trunk/blender/source/blender/makesdna/DNA_meshdata_types.h	2011-12-28 08:29:03 UTC (rev 42910)
@@ -73,20 +73,19 @@
 } MCol;
 
 /*bmesh custom data stuff*/
-typedef struct MTexPoly{
+typedef struct MTexPoly {
 	struct Image *tpage;
 	char flag, transp;
 	short mode,tile,unwrap;
 }MTexPoly;
 
-typedef struct MLoopUV{
+typedef struct MLoopUV {
 	float uv[2];
 }MLoopUV;
 
-typedef struct MLoopCol{
+typedef struct MLoopCol {
 	char a, r, g, b;
-	int pad;  /*waste!*/
-}MLoopCol;
+} MLoopCol;
 
 typedef struct MSticky {
 	float co[2];
@@ -108,10 +107,10 @@
 typedef struct MFloatProperty{
 	float	f;
 } MFloatProperty;
-typedef struct MIntProperty{
+typedef struct MIntProperty {
 	int		i;
 } MIntProperty;
-typedef struct MStringProperty{
+typedef struct MStringProperty {
 	char	s[256];
 } MStringProperty;