sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles OSL: update to build with latest OSL master branch.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-09-09 21:52:26 +00:00
parent 1bbc432ead
commit 04316efc4a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,11 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag,
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 @@ static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure)
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 @@ static void flatten_volume_closure_tree(ShaderData *sd,
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: {