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
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-21 23:09:52 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-21 23:13:25 +0300
commite3461a02ac3617ee50a60601ed277b0cb65459ce (patch)
tree6ba65450746a7dfaf76adae171b52cbe0c2da84d /intern
parentf2c54df625d65c40f6070294a5f66de3f2d18c10 (diff)
Fix T43779: Cycles texture interpolation issues
That was basically not an issue with interpolation, but rather missing wrapping options and periodic wrapping was always used. It's still a bit questionable why certain graphics cards were doing clamping in the file from the report, that's not something what is expected to happen from the settings of textures being passed to GPU. In any case this issue i still didn't manage to reproduce on any of the available GPUs, might be something related on driver glitch or so. In any case CPU now should behave just fine, rest of the issues we'll need to be able to reproduce first.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_shader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index fe7bd76d6b4..294247157c1 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -594,13 +594,13 @@ static ShaderNode *add_node(Scene *scene,
image->filename,
image->builtin_data,
(InterpolationType)b_image_node.interpolation(),
- EXTENSION_REPEAT);
+ (ExtensionType)b_image_node.extension());
}
}
image->color_space = ImageTextureNode::color_space_enum[(int)b_image_node.color_space()];
image->projection = ImageTextureNode::projection_enum[(int)b_image_node.projection()];
image->interpolation = (InterpolationType)b_image_node.interpolation();
- image->extension = EXTENSION_REPEAT;
+ image->extension = (ExtensionType)b_image_node.extension();
image->projection_blend = b_image_node.projection_blend();
get_tex_mapping(&image->tex_mapping, b_image_node.texture_mapping());
node = image;