diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-03-08 03:23:45 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-03-08 03:23:45 +0400 |
| commit | 36279afbd356364b4b6e059d675ba0515b6b7a44 (patch) | |
| tree | ec725808f5e60c4f79a0a2816dc81efa11eb9931 /source | |
| parent | dd2dca2f7e77e7521d13b78e875ffa58a90846f2 (diff) | |
Cycles: Compile fix and some cleanup for the Image interpolation commit.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 1ad713e64e0..2d3a0fa2057 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -952,10 +952,10 @@ typedef struct NodeShaderNormalMap { #define SHD_PROJ_BOX 1 /* image texture interpolation */ -#define SHD_INTER_LINEAR 0 -#define SHD_INTER_CLOSEST 1 -#define SHD_INTER_CUBIC 2 -#define SHD_INTER_SMART 3 +#define SHD_INTERP_LINEAR 0 +#define SHD_INTERP_CLOSEST 1 +#define SHD_INTERP_CUBIC 2 +#define SHD_INTERP_SMART 3 /* tangent */ #define SHD_TANGENT_RADIAL 0 diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index ae7dcdac423..080652f9578 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3429,13 +3429,13 @@ static void def_sh_tex_image(StructRNA *srna) }; static const EnumPropertyItem prop_interpolation_items[] = { - {SHD_INTER_LINEAR, "Linear", 0, "Linear", + {SHD_INTERP_LINEAR, "Linear", 0, "Linear", "Linear interpolation"}, - {SHD_INTER_CLOSEST, "Closest", 0, "Closest", + {SHD_INTERP_CLOSEST, "Closest", 0, "Closest", "No interpolation (sample closest texel"}, - {SHD_INTER_CUBIC, "Cubic", 0, "Cubic", + {SHD_INTERP_CUBIC, "Cubic", 0, "Cubic", "Cubic interpolation (OSL only)"}, - {SHD_INTER_SMART, "Smart", 0, "Smart", + {SHD_INTERP_SMART, "Smart", 0, "Smart", "Bicubic when maxifying, else bilinear (OSL only)"}, {0, NULL, 0, NULL, NULL} }; |