diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-28 14:21:13 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-28 14:41:09 +0300 |
commit | 038d6ce2cce5aaabfbba90d934b235601fcb561f (patch) | |
tree | 3a1697e5a3616bfd49b7927407e882e9e2c183a7 /intern | |
parent | c6396d9204cb40f7736530e793288948e1adb55f (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 'intern')
-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 |
3 files changed, 6 insertions, 6 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 */ |