diff options
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 6 | ||||
| -rw-r--r-- | intern/cycles/util/util_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 294247157c1..0f0be78abd8 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -767,7 +767,7 @@ static ShaderNode *add_node(Scene *scene, point_density->filename, point_density->builtin_data, point_density->interpolation, - EXTENSION_CLIP); + EXTENSION_REPEAT); } node = point_density; } diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 1150c63a65a..e766c0c20d6 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1375,7 +1375,7 @@ PointDensityTextureNode::~PointDensityTextureNode() image_manager->remove_image(filename, builtin_data, interpolation, - EXTENSION_CLIP); + EXTENSION_REPEAT); } } @@ -1419,7 +1419,7 @@ void PointDensityTextureNode::compile(SVMCompiler& compiler) false, 0, is_float, is_linear, interpolation, - EXTENSION_CLIP, + EXTENSION_REPEAT, true); } @@ -1467,7 +1467,7 @@ void PointDensityTextureNode::compile(OSLCompiler& compiler) false, 0, is_float, is_linear, interpolation, - EXTENSION_CLIP, + EXTENSION_REPEAT, true); } diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 411f2d803f8..5198194b652 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -477,8 +477,8 @@ enum InterpolationType { enum ExtensionType { /* Cause the image to repeat horizontally and vertically. */ EXTENSION_REPEAT = 0, - /* Clip to image size and set exterior pixels as transparent. */ - EXTENSION_CLIP = 1, + /* Extend by repeating edge pixels of the image. */ + EXTENSION_EXTEND = 1, }; /* macros */ 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} }; |