[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53055] trunk/blender/intern/cycles/kernel : Cycles OSL: small optimization to geometry node, tangent output still was

[Brecht Van Lommel]

Revision: 53055
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53055
Author:   blendix
Date:     2012-12-16 09:37:32 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
Cycles OSL: small optimization to geometry node, tangent output still was
not properly optimized out in some cases.

For reference, setting this will give detailed information about OSL shaders:
export OSL_OPTIONS="statistics:level=1,debug=1,llvm_debug=1"

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

Modified: trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-12-16 09:37:15 UTC (rev 53054)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-12-16 09:37:32 UTC (rev 53055)
@@ -172,9 +172,6 @@
 					break;
 				}
 				case OSL::ClosurePrimitive::Emissive: {
-					if (sd->num_closure == MAX_CLOSURE)
-						return;
-
 					/* sample weight */
 					float sample_weight = fabsf(average(weight));
 

Modified: trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl	2012-12-16 09:37:15 UTC (rev 53054)
+++ trunk/blender/intern/cycles/kernel/shaders/node_geometry.osl	2012-12-16 09:37:32 UTC (rev 53055)
@@ -56,8 +56,7 @@
 		                        0.0, 0.0, 0.0, 0.0,
 		                        0.5, -0.5, 0.0, 1.0);
 
-		vector T = transform(project, generated);
-		T = transform("object", "world", T);
+		vector T = transform("object", "world", transform(project, generated));
 		Tangent = cross(Normal, normalize(cross(T, Normal)));
 	}
 	else {