[Bf-blender-cvs] [dc40928] master: Cycles: Fix crash with environment maps and packed images

[Sergey Sharybin]

Commit: dc40928087e9b1183a6df2b38bb6a9a610e4ed13
Author: Sergey Sharybin
Date:   Mon Jul 7 12:37:45 2014 +0600
https://developer.blender.org/rBdc40928087e9b1183a6df2b38bb6a9a610e4ed13

Cycles: Fix crash with environment maps and packed images

===================================================================

M	intern/cycles/render/nodes.cpp

===================================================================

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 251afe9..e8476bf 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);