diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-23 12:41:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-23 12:41:53 +0400 |
| commit | 4ced91da47ec1e95d71beef07b218fd0290ff68a (patch) | |
| tree | 5f96c6268e194dd4cabcbe33efdc2fd226652cab /intern/cycles/blender/blender_mesh.cpp | |
| parent | 87a34772003413bd402ea380ce5d8d7c3f3a6337 (diff) | |
| parent | ac498a6b64ea2f034aa0177894fb25d0401e327b (diff) | |
svn merge ^/trunk/blender -r42778:42839
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 bb4fef4a602..b3c9cccfb5d 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); } |