From b98e6743dcaf8ec513bbbadc0015cb8729a72a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sun, 23 Dec 2018 16:26:21 +0100 Subject: Texture Paint: Add filtering option for texture paint overlay The overlay should now use the texture interpolation setting in material mode. In image mode, there is now a new button to let the user choose the texture filter. The option is located in the Texture Slots popover and only shows in Image mode. --- source/blender/makesdna/DNA_material_types.h | 3 ++- source/blender/makesdna/DNA_scene_types.h | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 1e8173fc16d..6cd964fddf9 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -54,7 +54,8 @@ typedef struct TexPaintSlot { char *uvname; /** Do we have a valid image and UV map. */ int valid; - int pad; + /** Copy of node inteporlation setting. */ + int interp; } TexPaintSlot; typedef struct MaterialGPencilStyle { diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index a1e2afaf055..3186e8a435b 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -923,6 +923,9 @@ typedef struct ImagePaintSettings { float stencil_col[3]; /** Dither amount used when painting on byte images. */ float dither; + /** Display texture interpolation method. */ + int interp; + int pad; } ImagePaintSettings; /* ------------------------------------------- */ @@ -2207,6 +2210,12 @@ typedef enum eImagePaintMode { IMAGEPAINT_MODE_IMAGE, /* select texture paint image directly */ } eImagePaintMode; +/* ImagePaintSettings.interp */ +enum { + IMAGEPAINT_INTERP_LINEAR = 0, + IMAGEPAINT_INTERP_CLOSEST, +}; + /* ImagePaintSettings.flag */ #define IMAGEPAINT_DRAWING (1 << 0) // #define IMAGEPAINT_DRAW_TOOL (1 << 1) // deprecated -- cgit v1.2.3