diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-13 18:20:06 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-13 18:20:23 +0400 |
| commit | 301d7d2f63f3e9e5560500c225f9ae437075418f (patch) | |
| tree | b808193627206b1b02a821d7e09a248368de0b87 /source/blender/editors/sculpt_paint/paint_intern.h | |
| parent | 06cd5505287bd893eae1383cab413ba54d66ed1d (diff) | |
Fix T39430, incorrect color management in paint cursor when using
texture nodes.
Adopt a similar system to texture sampling for painting.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_intern.h')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_intern.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index cae785973bf..0c3cdc7a205 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -37,6 +37,7 @@ struct bContext; struct bglMats; struct Brush; struct ImagePool; +struct ImBuf; struct ListBase; struct Mesh; struct MTex; @@ -199,7 +200,7 @@ void paint_calc_redraw_planes(float planes[4][4], float paint_calc_object_space_radius(struct ViewContext *vc, const float center[3], float pixel_radius); float paint_get_tex_pixel(struct MTex *mtex, float u, float v, struct ImagePool *pool, int thread); -void paint_get_tex_pixel_col(struct MTex *mtex, float u, float v, float rgba[4], struct ImagePool *pool, int thread); +void paint_get_tex_pixel_col(struct MTex *mtex, float u, float v, float rgba[4], struct ImagePool *pool, int thread, bool convert, struct ImBuf *ibuf); void brush_drawcursor_texpaint_uvsculpt(struct bContext *C, int x, int y, void *customdata); void paint_sample_color(const struct bContext *C, struct ARegion *ar, int x, int y); |