Cycles: OSL build & image manager fixes.

This commit is contained in:
Brecht Van Lommel
2011-05-31 16:21:30 +00:00
parent fc68daff58
commit 966e004bbe
9 changed files with 90 additions and 20 deletions

View File

@@ -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