diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:17:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-06 11:17:58 +0300 |
commit | 1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (patch) | |
tree | 982857c47d650cb3f53df065cdcbcca827bff56d /intern/cycles/kernel/osl/osl_shader.cpp | |
parent | 62fbb7d4a10bea1ce88a486657a87743b93c9fd1 (diff) |
Cleanup: strip trailing space for cycles
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
-rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index b7d1c629291..6a690e880ad 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -115,7 +115,7 @@ static void shaderdata_to_shaderglobals(KernelGlobals *kg, ShaderData *sd, PathS globals->backfacing = (sd->flag & SD_BACKFACING); /* shader data to be used in services callbacks */ - globals->renderstate = sd; + globals->renderstate = sd; /* hacky, we leave it to services to fetch actual object matrix */ globals->shader2common = sd; @@ -340,7 +340,7 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, PathState *state, if(kg->osl->volume_state[shader]) { ss->execute(octx, *(kg->osl->volume_state[shader]), *globals); } - + /* flatten closure tree */ if(globals->Ci) flatten_volume_closure_tree(sd, globals->Ci); @@ -405,4 +405,3 @@ int OSLShader::find_attribute(KernelGlobals *kg, const ShaderData *sd, uint id, } CCL_NAMESPACE_END - |