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>2017-01-25 16:02:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-25 16:02:59 +0300
commitced20b74e58f3dd33840f2a62f6f1f19714b35d7 (patch)
tree5f97a618b28c9a88635d511178d63c59d8fcc186 /intern/cycles/render/nodes.cpp
parente29a6f739de36f4d33cd37181a946345bd26503d (diff)
Fix T50032: Wrong render result when same image is used with and without alpha
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1e4a9fd300c..13b149eddfa 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -263,7 +263,8 @@ ImageTextureNode::~ImageTextureNode()
image_manager->remove_image(filename.string(),
builtin_data,
interpolation,
- extension);
+ extension,
+ use_alpha);
}
}
@@ -462,7 +463,8 @@ EnvironmentTextureNode::~EnvironmentTextureNode()
image_manager->remove_image(filename.string(),
builtin_data,
interpolation,
- EXTENSION_REPEAT);
+ EXTENSION_REPEAT,
+ use_alpha);
}
}
@@ -1381,7 +1383,8 @@ PointDensityTextureNode::~PointDensityTextureNode()
image_manager->remove_image(filename.string(),
builtin_data,
interpolation,
- EXTENSION_CLIP);
+ EXTENSION_CLIP,
+ true);
}
}