griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

minor changes from bmesh into trunk

Browse Source
This commit is contained in:
Campbell Barton
2011-12-28 08:29:03 +00:00
parent f89aeae10c
commit b459067dd2
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_customdata_types.h
View File

@@ -75,7 +75,7 @@ typedef struct CustomData {
#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 @@ typedef struct CustomData {
#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)

13
source/blender/makesdna/DNA_meshdata_types.h
View File

@@ -73,20 +73,19 @@ typedef struct MCol {
} 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 MTFace {
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;