diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-20 21:40:21 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-20 21:40:21 +0400 |
| commit | fd619cd7f1fca63a9d19df4301a185c86ea6dc2c (patch) | |
| tree | 0a9f143efe52eda35f3752991d368c5476422e2f /intern/cycles/render/osl.cpp | |
| parent | ab1b5af08d25b5c9bdb11110e4e8b607fdea3af5 (diff) | |
Fix #33177: OSL render difference with missing textures and HSV nodes.
Diffstat (limited to 'intern/cycles/render/osl.cpp')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index d2600541efc..c5ecddcfc15 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -88,6 +88,7 @@ void OSLShaderManager::device_update(Device *device, DeviceScene *dscene, Scene /* setup shader engine */ og->ss = ss; + og->ts = ts; og->services = services; int background_id = scene->shader_manager->get_shader_id(scene->default_background); og->background_state = og->surface_state[background_id & SHADER_MASK]; @@ -118,6 +119,7 @@ void OSLShaderManager::device_free(Device *device, DeviceScene *dscene) /* clear shader engine */ og->use = false; og->ss = NULL; + og->ts = NULL; og->surface_state.clear(); og->volume_state.clear(); @@ -334,7 +336,7 @@ string OSLCompiler::compatible_name(ShaderNode *node, ShaderOutput *output) while((i = sname.find(" ")) != string::npos) sname.replace(i, 1, ""); - /* if output exists with the same name, add "In" suffix */ + /* if input exists with the same name, add "Out" suffix */ foreach(ShaderInput *input, node->inputs) { if (strcmp(input->name, output->name)==0) { sname += "Out"; |