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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-21 17:00:51 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-21 17:00:51 +0400
commit90cdf34f560b0527b4211ebd5f941e4265bac8d0 (patch)
treec4eaddceb299f3d9e6825eeb82f40c7198995f30 /intern/cycles/render/nodes.cpp
parentfde8b0f7bc4c837075b7f7d7e51028e53a7a80fe (diff)
Fix #32796: cycles did not support image auto refresh option.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index b297e6ea38c..48a8565ed98 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -145,6 +145,7 @@ ImageTextureNode::ImageTextureNode()
color_space = ustring("Color");
projection = ustring("Flat");;
projection_blend = 0.0f;
+ animated = false;
add_input("Vector", SHADER_SOCKET_POINT, ShaderInput::TEXTURE_UV);
add_output("Color", SHADER_SOCKET_COLOR);
@@ -175,7 +176,7 @@ void ImageTextureNode::compile(SVMCompiler& compiler)
image_manager = compiler.image_manager;
if(is_float == -1) {
bool is_float_bool;
- slot = image_manager->add_image(filename, is_float_bool);
+ slot = image_manager->add_image(filename, animated, is_float_bool);
is_float = (int)is_float_bool;
}
@@ -272,6 +273,7 @@ EnvironmentTextureNode::EnvironmentTextureNode()
filename = "";
color_space = ustring("Color");
projection = ustring("Equirectangular");
+ animated = false;
add_input("Vector", SHADER_SOCKET_VECTOR, ShaderInput::POSITION);
add_output("Color", SHADER_SOCKET_COLOR);
@@ -302,7 +304,7 @@ void EnvironmentTextureNode::compile(SVMCompiler& compiler)
image_manager = compiler.image_manager;
if(slot == -1) {
bool is_float_bool;
- slot = image_manager->add_image(filename, is_float_bool);
+ slot = image_manager->add_image(filename, animated, is_float_bool);
is_float = (int)is_float_bool;
}