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

Cycles: Fix wrong order of light manager update tag

Browse Source 
Shader's has_surface_emission will only be known for sure after compilation.
This commit is contained in:
Sergey Sharybin
2016-07-28 12:31:01 +02:00
parent d3d1313ca4
commit 9f18e3acd6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/render/svm.cpp
View File

@@ -65,20 +65,21 @@ void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene
svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0)); svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0));
svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0)); svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0));
} }
foreach(Shader *shader, scene->shaders) { foreach(Shader *shader, scene->shaders) {
if(progress.get_cancel()) return; if(progress.get_cancel()) return;
assert(shader->graph); assert(shader->graph);
if(shader->use_mis && shader->has_surface_emission)
scene->light_manager->need_update = true;
SVMCompiler::Summary summary; SVMCompiler::Summary summary;
SVMCompiler compiler(scene->shader_manager, scene->image_manager); SVMCompiler compiler(scene->shader_manager, scene->image_manager);
compiler.background = (shader == scene->default_background); compiler.background = (shader == scene->default_background);
compiler.compile(scene, shader, svm_nodes, shader->id, &summary); compiler.compile(scene, shader, svm_nodes, shader->id, &summary);
if(shader->use_mis && shader->has_surface_emission) {
scene->light_manager->need_update = true;
}
VLOG(2) << "Compilation summary:\n" VLOG(2) << "Compilation summary:\n"
<< "Shader name: " << shader->name << "\n" << "Shader name: " << shader->name << "\n"
<< summary.full_report(); << summary.full_report();