Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / OSL:

Browse Source 
* OSL namespace fixes for osl_shader.cpp.
This commit is contained in:
Thomas Dinges
2012-08-31 20:08:55 +00:00
parent 01815d83fb
commit 7ac0dd2953
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
sc.weight = weight; sc.weight = weight;
switch (prim->category()) { switch (prim->category()) {
case ClosurePrimitive::BSDF: { case OSL::ClosurePrimitive::BSDF: {
if (sd->num_closure == MAX_CLOSURE) if (sd->num_closure == MAX_CLOSURE)
return; return;
@@ -153,7 +153,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
sd->closure[sd->num_closure++] = sc; sd->closure[sd->num_closure++] = sc;
break; break;
} }
case ClosurePrimitive::Emissive: { case OSL::ClosurePrimitive::Emissive: {
if (sd->num_closure == MAX_CLOSURE) if (sd->num_closure == MAX_CLOSURE)
return; return;
@@ -169,7 +169,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
sd->closure[sd->num_closure++] = sc; sd->closure[sd->num_closure++] = sc;
break; break;
} }
case ClosurePrimitive::Holdout: case OSL::ClosurePrimitive::Holdout:
if (sd->num_closure == MAX_CLOSURE) if (sd->num_closure == MAX_CLOSURE)
return; return;
@@ -178,11 +178,11 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
sd->flag |= SD_HOLDOUT; sd->flag |= SD_HOLDOUT;
sd->closure[sd->num_closure++] = sc; sd->closure[sd->num_closure++] = sc;
break; break;
case ClosurePrimitive::BSSRDF: case OSL::ClosurePrimitive::BSSRDF:
case ClosurePrimitive::Debug: case OSL::ClosurePrimitive::Debug:
break; /* not implemented */ break; /* not implemented */
case ClosurePrimitive::Background: case OSL::ClosurePrimitive::Background:
case ClosurePrimitive::Volume: case OSL::ClosurePrimitive::Volume:
break; /* not relevant */ break; /* not relevant */
} }
} }
@@ -297,7 +297,7 @@ static void flatten_volume_closure_tree(ShaderData *sd,
sc.weight = weight; sc.weight = weight;
switch (prim->category()) { switch (prim->category()) {
case ClosurePrimitive::Volume: { case OSL::ClosurePrimitive::Volume: {
if (sd->num_closure == MAX_CLOSURE) if (sd->num_closure == MAX_CLOSURE)
return; return;
@@ -311,13 +311,13 @@ static void flatten_volume_closure_tree(ShaderData *sd,
sd->closure[sd->num_closure++] = sc; sd->closure[sd->num_closure++] = sc;
break; break;
} }
case ClosurePrimitive::Holdout: case OSL::ClosurePrimitive::Holdout:
case ClosurePrimitive::Debug: case OSL::ClosurePrimitive::Debug:
break; /* not implemented */ break; /* not implemented */
case ClosurePrimitive::Background: case OSL::ClosurePrimitive::Background:
case ClosurePrimitive::BSDF: case OSL::ClosurePrimitive::BSDF:
case ClosurePrimitive::Emissive: case OSL::ClosurePrimitive::Emissive:
case ClosurePrimitive::BSSRDF: case OSL::ClosurePrimitive::BSSRDF:
break; /* not relevant */ break; /* not relevant */
} }
} }