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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-28 14:21:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-28 14:41:09 +0300
commit038d6ce2cce5aaabfbba90d934b235601fcb561f (patch)
tree3a1697e5a3616bfd49b7927407e882e9e2c183a7 /source/blender
parentc6396d9204cb40f7736530e793288948e1adb55f (diff)
Cycles: Correction to image extension setting commit
Technically it was all wrong and it should have been called Extend instead of Clip. Got confused by the naming in different libraries. More options are still to come.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/makesdna/DNA_node_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index f6875e8dba9..45407d1bcda 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -978,7 +978,7 @@ typedef struct NodeSunBeams {
#define SHD_PROJ_MIRROR_BALL 1
#define SHD_IMAGE_EXTENSION_REPEAT 0
-#define SHD_IMAGE_EXTENSION_CLIP 1
+#define SHD_IMAGE_EXTENSION_EXTEND 1
/* image texture */
#define SHD_PROJ_FLAT 0
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 168b2ce05f6..2c86799f0e2 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3625,7 +3625,7 @@ static void def_sh_tex_image(StructRNA *srna)
static EnumPropertyItem prop_image_extension[] = {
{SHD_IMAGE_EXTENSION_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"},
- {SHD_IMAGE_EXTENSION_CLIP, "CLIP", 0, "Clip", "Clip to image size and set exterior pixels as transparent"},
+ {SHD_IMAGE_EXTENSION_EXTEND, "EXTEND", 0, "Extend", "Extend by repeating edge pixels of the image"},
{0, NULL, 0, NULL, NULL}
};