Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-05-29 14:38:20 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-05-29 14:38:20 +0300
commit2f2f7c0e875b2cfcd7b5caa0af532401deac67be (patch)
tree5deed14635e8415274f8bf9b512f8d4f147207d5 /source/blender/imbuf/IMB_imbuf.h
parent1bede8644a762279119adafb6e1b5e03884601e6 (diff)
Fix T44882, color picker in texpainting doing linear interpolation even
when mipmap is off. We used to always have nearest interpolation for texpaint but at least make this work with mipmap off correctly. Also added conversion casts to avoid integer overflow in filtering code
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf.h')
-rw-r--r--source/blender/imbuf/IMB_imbuf.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h
index 4a2d05bdf61..ed16c670002 100644
--- a/source/blender/imbuf/IMB_imbuf.h
+++ b/source/blender/imbuf/IMB_imbuf.h
@@ -467,6 +467,7 @@ void bilinear_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float
void bicubic_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void nearest_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
+void nearest_interpolation_color_wrap(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void bilinear_interpolation_color(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);
void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char col[4], float col_float[4], float u, float v);