diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-14 15:50:03 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-17 22:39:16 +0300 |
| commit | 0e8cd14dfee9788f24854aa8f4148033ef042f51 (patch) | |
| tree | 4fd7fdb358f9ef4ccdcb934025b74ee6f25598ad /intern/cycles/render/svm.cpp | |
| parent | 08670d3b8117cda608c178688f261e1204794a0d (diff) | |
Code refactor: use shader pointers rather than shader indexes.
Diffstat (limited to 'intern/cycles/render/svm.cpp')
| -rw-r--r-- | intern/cycles/render/svm.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index 1d00a5f764e..ab4fe4193db 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -66,9 +66,7 @@ void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene svm_nodes.push_back(make_int4(NODE_SHADER_JUMP, 0, 0, 0)); } - for(i = 0; i < scene->shaders.size(); i++) { - Shader *shader = scene->shaders[i]; - + foreach(Shader *shader, scene->shaders) { if(progress.get_cancel()) return; assert(shader->graph); @@ -78,8 +76,8 @@ void SVMShaderManager::device_update(Device *device, DeviceScene *dscene, Scene SVMCompiler::Summary summary; SVMCompiler compiler(scene->shader_manager, scene->image_manager); - compiler.background = ((int)i == scene->default_background); - compiler.compile(scene, shader, svm_nodes, i, &summary); + compiler.background = (shader == scene->default_background); + compiler.compile(scene, shader, svm_nodes, shader->id, &summary); VLOG(2) << "Compilation summary:\n" << "Shader name: " << shader->name << "\n" |