[Bf-blender-cvs] [3e32f8e] master: Fix T48298: Cycles World environment Texture node, movie doesn't update frame

[Sergey Sharybin]

Commit: 3e32f8e601b6ed9de80135e61b92cf8bffa2632a
Author: Sergey Sharybin
Date:   Fri Apr 29 10:54:40 2016 +0200
Branches: master
https://developer.blender.org/rB3e32f8e601b6ed9de80135e61b92cf8bffa2632a

Fix T48298: Cycles World environment Texture node, movie doesn't update frame

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

M	intern/cycles/blender/blender_shader.cpp

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 4f7ca30..ba806e2 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -732,10 +732,10 @@ static ShaderNode *add_node(Scene *scene,
 				env->filename = image_user_file_path(b_image_user,
 				                                     b_image,
 				                                     b_scene.frame_current());
-				env->animated = b_env_node.image_user().use_auto_refresh();
 				env->builtin_data = NULL;
 			}
 
+			env->animated = b_env_node.image_user().use_auto_refresh();
 			env->use_alpha = b_image.use_alpha();
 
 			/* TODO(sergey): Does not work properly when we change builtin type. */