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/makesdna
parentdd2dca2f7e77e7521d13b78e875ffa58a90846f2 (diff)
Cycles: Compile fix and some cleanup for the Image interpolation commit.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_node_types.h8
1 files changed, 4 insertions, 4 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