[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52610] trunk/blender/intern/cycles/render /osl.cpp: Fix cycles OSL shader loading warnings after recent bugfix.
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Nov 27 17:02:13 CET 2012
Revision: 52610
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52610
Author: blendix
Date: 2012-11-27 16:02:12 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Fix cycles OSL shader loading warnings after recent bugfix.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/osl.cpp
Modified: trunk/blender/intern/cycles/render/osl.cpp
===================================================================
--- trunk/blender/intern/cycles/render/osl.cpp 2012-11-27 16:02:03 UTC (rev 52609)
+++ trunk/blender/intern/cycles/render/osl.cpp 2012-11-27 16:02:12 UTC (rev 52610)
@@ -351,6 +351,9 @@
{
/* 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)
More information about the Bf-blender-cvs
mailing list