From 30f626fe4cd62f406468ef0ff2169694424b1a29 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 27 Oct 2020 11:40:42 +0100 Subject: Revert "Cycles API: encapsulate Node socket members" This reverts commit 527f8b32b32187f754e5b176db6377736f9cb8ff. It is causing motion blur test failures and crashes in some renders, reverting until this is fixed. --- intern/cycles/render/osl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/cycles/render/osl.cpp') diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index bea2c534bd1..0c2b2cf27e9 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -131,7 +131,7 @@ void OSLShaderManager::device_update(Device *device, compiler.background = (shader == background_shader); compiler.compile(og, shader); - if (shader->get_use_mis() && shader->has_surface_emission) + if (shader->use_mis && shader->has_surface_emission) scene->light_manager->need_update = true; } @@ -145,7 +145,7 @@ void OSLShaderManager::device_update(Device *device, og->use = true; foreach (Shader *shader, scene->shaders) - shader->clear_modified(); + shader->need_update = false; need_update = false; @@ -1120,18 +1120,18 @@ OSL::ShaderGroupRef OSLCompiler::compile_type(Shader *shader, ShaderGraph *graph void OSLCompiler::compile(OSLGlobals *og, Shader *shader) { - if (shader->is_modified()) { + if (shader->need_update) { ShaderGraph *graph = shader->graph; ShaderNode *output = (graph) ? graph->output() : NULL; - bool has_bump = (shader->get_displacement_method() != DISPLACE_TRUE) && + bool has_bump = (shader->displacement_method != DISPLACE_TRUE) && output->input("Surface")->link && output->input("Displacement")->link; /* finalize */ shader->graph->finalize(scene, has_bump, shader->has_integrator_dependency, - shader->get_displacement_method() == DISPLACE_BOTH); + shader->displacement_method == DISPLACE_BOTH); current_shader = shader; -- cgit v1.2.3