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:
authorThomas Dinges <blender@dingto.org>2014-03-08 03:23:45 +0400
committerThomas Dinges <blender@dingto.org>2014-03-08 03:23:45 +0400
commit36279afbd356364b4b6e059d675ba0515b6b7a44 (patch)
treeec725808f5e60c4f79a0a2816dc81efa11eb9931 /source/blender/makesrna/intern/rna_nodetree.c
parentdd2dca2f7e77e7521d13b78e875ffa58a90846f2 (diff)
Cycles: Compile fix and some cleanup for the Image interpolation commit.
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c8
1 files changed, 4 insertions, 4 deletions
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}
};