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>2011-05-31 20:21:30 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-05-31 20:21:30 +0400
commit966e004bbea6304840cd73f262d91a5e65464e5f (patch)
treeb9d4a9e233e471e2fa143e27b26058d6093c9d56 /intern/cycles/render/nodes.cpp
parentfc68daff582664bc1ccba57b9408973c5e8d83ec (diff)
Cycles: OSL build & image manager fixes.
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 0e14deac98f..546d74c5c22 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -53,8 +53,8 @@ ImageTextureNode::ImageTextureNode()
ImageTextureNode::~ImageTextureNode()
{
- if(image_manager && slot != -1)
- image_manager->remove_image(slot);
+ if(image_manager)
+ image_manager->remove_image(filename);
}
ShaderNode *ImageTextureNode::clone() const
@@ -117,8 +117,8 @@ EnvironmentTextureNode::EnvironmentTextureNode()
EnvironmentTextureNode::~EnvironmentTextureNode()
{
- if(image_manager && slot != -1)
- image_manager->remove_image(slot);
+ if(image_manager)
+ image_manager->remove_image(filename);
}
ShaderNode *EnvironmentTextureNode::clone() const