diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
| commit | 65f3b93f144699fa4aafa46c7e226aa1390b7239 (patch) | |
| tree | 1a9599589c98d9e17631844fd011463031fe59cd /intern/cycles/blender/blender_mesh.cpp | |
| parent | 99d893bb89a96dd0d6cb9410b12928e7ade4b565 (diff) | |
| parent | a88b29c062f32514e4414bfd4006f7b348077a42 (diff) | |
svn merge ^/trunk/blender -r42521:42550
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 7b701be49d7..bb4fef4a602 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -233,9 +233,9 @@ 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); + find_shader(render_layer.material_override, used_shaders, scene->default_surface); else - find_shader(slot->material(), used_shaders); + find_shader(slot->material(), used_shaders, scene->default_surface); } if(used_shaders.size() == 0) |