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-27 20:02:12 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-27 20:02:12 +0400
commit5f8fded63943fd593f81203956968b97ec27c52c (patch)
tree0c8dfc0711e8f142f9fcedb838fe33400d8498ed /intern/cycles
parent2b080dbc4ee17d3562e74637d23d12e429e8c309 (diff)
Fix cycles OSL shader loading warnings after recent bugfix.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/osl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index c5ecddcfc15..c1d2eade5e5 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -351,6 +351,9 @@ bool OSLCompiler::node_skip_input(ShaderNode *node, ShaderInput *input)
{
/* exception for output node, only one input is actually used
* depending on the current shader type */
+
+ if(!(input->usage & ShaderInput::USE_OSL))
+ return true;
if(node->name == ustring("output")) {
if(strcmp(input->name, "Surface") == 0 && current_type != SHADER_TYPE_SURFACE)