diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-22 00:51:55 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-22 00:51:55 +0400 |
| commit | c287a09b40cf9010c36363d4ee61f7a88c6bad7d (patch) | |
| tree | 0b06cf9b90b0b1acf758ce25833b95b754e00b92 /intern/cycles/blender/blender_mesh.cpp | |
| parent | b65061e2ae95e92dea8b1009bf0cf4e02254dac2 (diff) | |
Cycles: support for multiple render layers. It currently renders each layer
entirely before moving on to the next.
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 4b7651dba4c..72b8cfa2355 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -232,8 +232,10 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated) BL::Object::material_slots_iterator slot; for(b_ob.material_slots.begin(slot); slot != b_ob.material_slots.end(); ++slot) { - if(render_layer.material_override) - find_shader(render_layer.material_override, used_shaders, scene->default_surface); + BL::Material material_override = render_layers.front().material_override; + + if(material_override) + find_shader(material_override, used_shaders, scene->default_surface); else find_shader(slot->material(), used_shaders, scene->default_surface); } |