diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-11-19 22:28:12 +0300 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-11-19 22:28:12 +0300 |
| commit | 28da9ad12ee9ab22432401a5c9cd485df971323a (patch) | |
| tree | ae0a5773a38df61531beac365530acb037fa6a9f /source/blender/makesdna/DNA_texture_types.h | |
| parent | 14a0718a8a4ed3ee95f6374e20dbe9e74cf3b5c6 (diff) | |
| parent | f8e56e96bf2be4580dd34c33c6379339642638f0 (diff) | |
svn merge -r 17201:17502 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_texture_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index b057efb4a55..fd497cef178 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -55,13 +55,13 @@ typedef struct MTex { float ofs[3], size[3]; short texflag, colormodel, pmapto, pmaptoneg; - short normapspace, pad[3]; + short normapspace, which_output, pad[2]; float r, g, b, k; float def_var, rt; float colfac, norfac, varfac; float dispfac; - float warpfac; + float warpfac; } MTex; @@ -199,6 +199,7 @@ typedef struct Tex { struct ImageUser iuser; + struct bNodeTree *nodetree; struct Ipo *ipo; struct Image *ima; struct PluginTex *plugin; @@ -207,6 +208,9 @@ typedef struct Tex { struct PreviewImage * preview; struct PointDensity *pd; + char use_nodes; + char pad[7]; + } Tex; /* used for mapping node. note: rot is in degrees */ |