diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 09:59:37 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 09:59:37 +0400 |
commit | a13f94865aa145be235eb28c411fdcc91982172e (patch) | |
tree | 0921fc9286dcf1ff04dcba7809206c4f02d0c255 /source/blender/makesdna/DNA_meshdata_types.h | |
parent | 58e7678952914060f9276b84eb9e6f3e22ae4642 (diff) | |
parent | b263aefb0ec4d6b46b4cd7e4b15ac7f99af4c59e (diff) |
svn merge ^/trunk/blender -r40371:40372
Diffstat (limited to 'source/blender/makesdna/DNA_meshdata_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 27ebc5e489d..bed35af85f5 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -274,6 +274,8 @@ typedef struct MRecast{ #define TF_SHAREDVERT 8 #define TF_LIGHT 16 +#define TF_CONVERTED 32 /* tface converted to material */ + #define TF_SHAREDCOL 64 #define TF_TILES 128 /* deprecated */ #define TF_BILLBOARD 256 |