diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-06-05 13:29:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-06-05 13:29:47 +0400 |
| commit | 2221b994bc67bd93d7eb97491d8dacfe869c1e9c (patch) | |
| tree | bb8445262d4287f3b8cc7370df3b65aaf9715635 /intern | |
| parent | 0adf252c9b92dac4bc56e92c531464c59b71d91c (diff) | |
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
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index fc28833bb8c..d8d510a7c9b 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -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 shaderdata_to_shaderglobals(KernelGlobals *kg, ShaderData *sd, 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 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, float randb, int 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 @@ float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, int path_fl 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) { |