diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-13 20:03:14 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-13 20:03:14 +0400 |
| commit | 6f153046e0ffec912883ab24b9fda823e9fbeb38 (patch) | |
| tree | 9a0d2705acdfe2a920eeaaeb0a0924cc9bf65e37 /source/blender/makesdna | |
| parent | 5d79c2662e043c35feeb4a31f3c5eb288e93c9c1 (diff) | |
Reduce overhead when sampling texture images for brushes. The tests can
be cached and reused.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index aada838fce5..e36ce7d9657 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -60,6 +60,7 @@ struct Editing; struct SceneStats; struct bGPdata; struct MovieClip; +struct ColorSpace; /* ************************************************************* */ /* Scene Data */ @@ -932,7 +933,9 @@ typedef struct UnifiedPaintSettings { float brush_rotation; - // all this below is used to communicate with the cursor drawing routine + /********************************************************************************* + * all data below are used to communicate with cursor drawing and tex sampling * + *********************************************************************************/ int draw_anchored; int anchored_size; float anchored_initial_mouse[2]; @@ -949,9 +952,14 @@ typedef struct UnifiedPaintSettings { /* position of mouse, used to sample the mask texture */ 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 that radius */ float pixel_radius; + int pad2; } UnifiedPaintSettings; typedef enum { |