forked from bartvdbraak/blender
Cycles OSL: update to build with latest OSL master branch.
This commit is contained in:
parent
1bbc432ead
commit
04316efc4a
@ -150,7 +150,11 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag,
|
|||||||
|
|
||||||
if (prim) {
|
if (prim) {
|
||||||
ShaderClosure sc;
|
ShaderClosure sc;
|
||||||
|
#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
|
||||||
|
sc.weight = weight*TO_FLOAT3(comp->w);
|
||||||
|
#else
|
||||||
sc.weight = weight;
|
sc.weight = weight;
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (prim->category()) {
|
switch (prim->category()) {
|
||||||
case OSL::ClosurePrimitive::BSDF: {
|
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();
|
OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data();
|
||||||
|
|
||||||
if (prim && prim->category() == OSL::ClosurePrimitive::Background)
|
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);
|
return make_float3(1.0f, 1.0f, 1.0f);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else if (closure->type == OSL::ClosureColor::MUL) {
|
else if (closure->type == OSL::ClosureColor::MUL) {
|
||||||
OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
|
OSL::ClosureMul *mul = (OSL::ClosureMul *)closure;
|
||||||
@ -379,7 +387,11 @@ static void flatten_volume_closure_tree(ShaderData *sd,
|
|||||||
|
|
||||||
if (prim) {
|
if (prim) {
|
||||||
ShaderClosure sc;
|
ShaderClosure sc;
|
||||||
|
#ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS
|
||||||
|
sc.weight = weight*TO_FLOAT3(comp->w);
|
||||||
|
#else
|
||||||
sc.weight = weight;
|
sc.weight = weight;
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (prim->category()) {
|
switch (prim->category()) {
|
||||||
case OSL::ClosurePrimitive::Volume: {
|
case OSL::ClosurePrimitive::Volume: {
|
||||||
|
Loading…
Reference in New Issue
Block a user