tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

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
11ce51418b
This commit is contained in:
Thomas Dinges 2012-06-05 09:29:47 +00:00
parent 0adf252c9b
commit 2221b994bc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/osl/osl_shader.cpp
View File

@ -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) {