diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-15 11:40:22 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-15 11:40:22 +0400 |
| commit | 34dc95f7eefece0839d1f2ee15585a8f6d9066a5 (patch) | |
| tree | b98cdb1e975089c60dc0bf14fc517c09612c910e /source/blender/makesdna/DNA_texture_types.h | |
| parent | 5a21bc578cc392b9f21ee5355f4062075f45f907 (diff) | |
| parent | 4bbccd39bc827e5d794bdbe987b4d48164e8d950 (diff) | |
svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 820d3309b13..6e889fda20a 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -53,17 +53,17 @@ typedef struct MTex { char uvname[32]; char projx, projy, projz, mapping; - float ofs[3], size[3]; + float ofs[3], size[3], rot; short texflag, colormodel, pmapto, pmaptoneg; - short normapspace, which_output, pad[2]; + short normapspace, which_output; + char brush_map_mode, pad[7]; float r, g, b, k; float def_var, rt; float colfac, norfac, varfac; float dispfac; float warpfac; - } MTex; #ifndef DNA_USHORT_FIX @@ -450,6 +450,11 @@ typedef struct TexMapping { #define MTEX_BLEND_COLOR 13 #define MTEX_NUM_BLENDTYPES 14 +/* brush_map_mode */ +#define MTEX_MAP_MODE_FIXED 0 +#define MTEX_MAP_MODE_TILED 1 +#define MTEX_MAP_MODE_3D 2 + /* **************** EnvMap ********************* */ /* type */ |