diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-30 13:59:40 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-30 13:59:40 +0400 |
commit | 9461af89f1da9d4d1f4eef952084bbc7711376d7 (patch) | |
tree | a37b94ed22a4657de052dd4377e5900681d7016a /source/blender/blenkernel/BKE_brush.h | |
parent | f01986c97c9b5f3fce9e11dadc1e89f8266732f3 (diff) |
Fix #35141: stencil and 3D texture mode did not work with 2D image paint.
Diffstat (limited to 'source/blender/blenkernel/BKE_brush.h')
-rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index 863d7b05693..0ae243483dd 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -38,6 +38,7 @@ struct Brush; struct ImBuf; struct ImagePool; struct Main; +struct rctf; struct Scene; struct wmOperator; // enum CurveMappingPreset; @@ -77,12 +78,12 @@ float BKE_brush_curve_strength(struct Brush *br, float p, const float len); /* u /* sampling */ float BKE_brush_sample_tex_3D(const Scene *scene, struct Brush *br, const float point[3], float rgba[4], const int thread, struct ImagePool *pool); -float BKE_brush_sample_tex_2D(const struct Scene *scene, struct Brush *brush, const float xy[2], - float rgba[4]); float BKE_brush_sample_masktex(const Scene *scene, struct Brush *br, const float point[3], const int thread, struct ImagePool *pool); -void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, short flt, short texfalloff, int size, - struct ImBuf **imbuf, bool use_color_correction, bool use_brush_alpha); +void BKE_brush_imbuf_new(const struct Scene *scene, struct Brush *brush, short flt, + short texfalloff, int size, struct ImBuf **imbuf, + bool use_color_correction, bool use_brush_alpha, + struct ImagePool *pool, struct rctf *mapping); /* texture */ unsigned int *BKE_brush_gen_texture_cache(struct Brush *br, int half_side); |