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>2014-07-07 10:37:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-07-07 10:37:45 +0400
commitdc40928087e9b1183a6df2b38bb6a9a610e4ed13 (patch)
tree6d0cefe0ee41d78c8840c70aff38b8e3733ec63a /intern/cycles/render
parent4299b000194c8e8467df6da4d4bc5141fddfa847 (diff)
Cycles: Fix crash with environment maps and packed images
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/nodes.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 251afe9a0a2..e8476bfac4c 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -488,6 +488,7 @@ void EnvironmentTextureNode::compile(OSLCompiler& compiler)
/* See comments in ImageTextureNode::compile about support
* of builtin images.
*/
+ image_manager = compiler.image_manager;
if(is_float == -1) {
if(builtin_data == NULL) {
is_float = (int)image_manager->is_float_image(filename, NULL, is_linear);