[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59972] trunk/blender/intern/cycles/kernel /osl/osl_shader.cpp: Cycles OSL: update to build with latest OSL master branch.

[Brecht Van Lommel]

Revision: 59972
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59972
Author:   blendix
Date:     2013-09-09 21:52:26 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Cycles OSL: update to build with latest OSL master branch.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2013-09-09 20:46:43 UTC (rev 59971)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2013-09-09 21:52:26 UTC (rev 59972)
@@ -150,7 +150,11 @@
 
 		if (prim) {
 			ShaderClosure sc;
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+			sc.weight = weight*TO_FLOAT3(comp->w);
+#else
 			sc.weight = weight;
+#endif
 
 			switch (prim->category()) {
 				case OSL::ClosurePrimitive::BSDF: {
@@ -327,7 +331,11 @@
 		OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
 
 		if (prim && prim->category() == OSL::ClosurePrimitive::Background)
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+			return TO_FLOAT3(comp->w);
+#else
 			return make_float3(1.0f, 1.0f, 1.0f);
+#endif
 	}
 	else if (closure->type == OSL::ClosureColor::MUL) {
 		OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
@@ -379,7 +387,11 @@
 
 		if (prim) {
 			ShaderClosure sc;
+#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
+			sc.weight = weight*TO_FLOAT3(comp->w);
+#else
 			sc.weight = weight;
+#endif
 
 			switch (prim->category()) {
 				case OSL::ClosurePrimitive::Volume: {