[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47452] trunk/blender/intern/cycles/kernel /osl/osl_shader.cpp: Cycles / OSL:

[Thomas Dinges]

Revision: 47452
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47452
Author:   dingto
Date:     2012-06-05 09:29:47 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* Remove oslexec_pvt.h header and some typo fixes. 
* This file needs deeper updates for changes done in OSL 0.6.0, see
https://github.com/imageworks/OpenShadingLanguage/commit/11ce51418b45e975ace4d919a4bdd8c2001ba300

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	2012-06-05 08:41:53 UTC (rev 47451)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-06-05 09:29:47 UTC (rev 47452)
@@ -27,7 +27,6 @@
 #include "util_foreach.h"
 
 #include <OSL/oslexec.h>
-#include <oslexec_pvt.h>
 
 CCL_NAMESPACE_BEGIN
 
@@ -111,7 +110,7 @@
 static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
                                          const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
 {
-	/* OSL gives use a closure tree, we flatten it into arrays per
+	/* OSL gives us a closure tree, we flatten it into arrays per
 	 * closure type, for evaluation, sampling, etc later on. */
 
 	if (closure->type == OSL::ClosureColor::COMPONENT) {
@@ -235,7 +234,7 @@
 
 static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure)
 {
-	/* OSL gives use a closure tree, if we are shading for background there
+	/* OSL gives us a closure tree, if we are shading for background there
 	 * is only one supported closure type at the moment, which has no evaluation
 	 * functions, so we just sum the weights */
 
@@ -289,7 +288,7 @@
 static void flatten_volume_closure_tree(ShaderData *sd,
                                         const OSL::ClosureColor *closure, float3 weight = make_float3(1.0f, 1.0f, 1.0f))
 {
-	/* OSL gives use a closure tree, we flatten it into arrays per
+	/* OSL gives us a closure tree, we flatten it into arrays per
 	 * closure type, for evaluation, sampling, etc later on. */
 
 	if (closure->type == OSL::ClosureColor::COMPONENT) {