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

Cleanup: Comments and unused variables.

Browse Source
This commit is contained in:
Thomas Dinges 2014-05-24 07:28:01 +02:00
parent f5055d8688
commit 7fb33e5c43
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -718,7 +718,7 @@ bool OSLRenderServices::get_background_attribute(KernelGlobals *kg, ShaderData *
return set_attribute_int(f, type, derivatives, val); return set_attribute_int(f, type, derivatives, val);
} }
else if (name == u_path_transparent_depth) { else if (name == u_path_transparent_depth) {
/* Ray Depth */ /* Transparent Ray Depth */
int f = sd->transparent_depth; int f = sd->transparent_depth;
return set_attribute_int(f, type, derivatives, val); return set_attribute_int(f, type, derivatives, val);
} }
@ -758,7 +758,6 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
KernelGlobals *kg = sd->osl_globals; KernelGlobals *kg = sd->osl_globals;
bool is_curve; bool is_curve;
int object; int object;
// int prim;
/* lookup of attribute on another object */ /* lookup of attribute on another object */
if (object_name != u_empty) { if (object_name != u_empty) {
@ -768,12 +767,10 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
return false; return false;
object = it->second; object = it->second;
// prim = PRIM_NONE;
is_curve = false; is_curve = false;
} }
else { else {
object = sd->object; object = sd->object;
// prim = sd->prim;
is_curve = (sd->type & PRIMITIVE_ALL_CURVE) != 0; is_curve = (sd->type & PRIMITIVE_ALL_CURVE) != 0;
if (object == OBJECT_NONE) if (object == OBJECT_NONE)