diff options
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 5444299b948..a0a933ef682 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -142,7 +142,7 @@ ImageTextureNode::ImageTextureNode() slot = -1; is_float = -1; filename = ""; - is_builtin = false; + builtin_data = NULL; color_space = ustring("Color"); projection = ustring("Flat"); projection_blend = 0.0f; @@ -156,7 +156,7 @@ ImageTextureNode::ImageTextureNode() ImageTextureNode::~ImageTextureNode() { if(image_manager) - image_manager->remove_image(filename, is_builtin); + image_manager->remove_image(filename, builtin_data); } ShaderNode *ImageTextureNode::clone() const @@ -177,7 +177,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_builtin, animated, is_float_bool); + slot = image_manager->add_image(filename, builtin_data, animated, is_float_bool); is_float = (int)is_float_bool; } @@ -238,7 +238,7 @@ void ImageTextureNode::compile(OSLCompiler& compiler) tex_mapping.compile(compiler); if(is_float == -1) - is_float = (int)image_manager->is_float_image(filename, false); + is_float = (int)image_manager->is_float_image(filename, NULL); compiler.parameter("filename", filename.c_str()); if(is_float || color_space != "Color") @@ -272,7 +272,7 @@ EnvironmentTextureNode::EnvironmentTextureNode() slot = -1; is_float = -1; filename = ""; - is_builtin = false; + builtin_data = NULL; color_space = ustring("Color"); projection = ustring("Equirectangular"); animated = false; @@ -285,7 +285,7 @@ EnvironmentTextureNode::EnvironmentTextureNode() EnvironmentTextureNode::~EnvironmentTextureNode() { if(image_manager) - image_manager->remove_image(filename, is_builtin); + image_manager->remove_image(filename, builtin_data); } ShaderNode *EnvironmentTextureNode::clone() const @@ -306,7 +306,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_builtin, animated, is_float_bool); + slot = image_manager->add_image(filename, builtin_data, animated, is_float_bool); is_float = (int)is_float_bool; } @@ -356,7 +356,7 @@ void EnvironmentTextureNode::compile(OSLCompiler& compiler) tex_mapping.compile(compiler); if(is_float == -1) - is_float = (int)image_manager->is_float_image(filename, false); + is_float = (int)image_manager->is_float_image(filename, NULL); compiler.parameter("filename", filename.c_str()); compiler.parameter("projection", projection); |