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_scene_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_scene_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 27b5da90d55..5f21e5473e4 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -985,25 +985,31 @@ typedef struct UnifiedPaintSettings { /* record movement of mouse so that rake can start at an intuitive angle */ float last_rake[2]; + float last_rake_angle, pad; float brush_rotation; + float brush_rotation_sec; /********************************************************************************* * all data below are used to communicate with cursor drawing and tex sampling * *********************************************************************************/ - int draw_anchored; int anchored_size; - char draw_inverted; - char pad3[7]; - float overlap_factor; /* normalization factor due to accumulated value of curve along spacing. * Calculated when brush spacing changes to dampen strength of stroke * if space attenuation is used*/ + char draw_inverted; + /* check is there an ongoing stroke right now */ + char stroke_active; + + char draw_anchored; + char do_linear_conversion; + float anchored_initial_mouse[2]; - /* check is there an ongoing stroke right now */ - int stroke_active; + /* radius of brush, premultiplied with pressure. + * In case of anchored brushes contains the anchored radius */ + float pixel_radius; /* drawing pressure */ float size_pressure_value; @@ -1015,13 +1021,7 @@ typedef struct UnifiedPaintSettings { float mask_tex_mouse[2]; /* ColorSpace cache to avoid locking up during sampling */ - int do_linear_conversion; struct ColorSpace *colorspace; - - /* radius of brush, premultiplied with pressure. - * In case of anchored brushes contains the anchored radius */ - float pixel_radius; - int pad4; } UnifiedPaintSettings; typedef enum { |