diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-12-27 01:51:27 +0300 |
commit | c7c10e5e283879961356050ba8a965d2239456b8 (patch) | |
tree | d89d06ca30d51087a9d958f66bbf240bd3c7807e /source/blender/makesdna/DNA_texture_types.h | |
parent | e0cf86a9e219dcd71e5d67b8f2999d41e7f8c492 (diff) |
Brush Texture Angle Goodies:
This commit includes a few things:
* It moves the Rake and Random flags from the brush to the MTex.
* The first change allows mask textures to have independent rake
support.
* Random rotation now has an angle value that controls the width of the
effect from the rake or default angle
* Rake and Random are now supported together.
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 d256cfb2e85..042645eeb76 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -62,11 +62,12 @@ typedef struct MTex { char uvname[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ char projx, projy, projz, mapping; - float ofs[3], size[3], rot; - + char brush_map_mode, brush_angle_mode; + char pad[2]; + float ofs[3], size[3], rot, random_angle; + short texflag, colormodel, pmapto, pmaptoneg; short normapspace, which_output; - char brush_map_mode, pad[7]; float r, g, b, k; float def_var, rt; @@ -512,6 +513,10 @@ typedef struct ColorMapping { #define MTEX_MAP_MODE_RANDOM 4 #define MTEX_MAP_MODE_STENCIL 5 +/* brush_angle_mode */ +#define MTEX_ANGLE_RANDOM 1 +#define MTEX_ANGLE_RAKE 2 + /* **************** ColorBand ********************* */ /* colormode */ |