diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-09 04:24:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-09 04:24:48 +0400 |
| commit | ea399744e7807b63f995c60724e773a0335d1d89 (patch) | |
| tree | 1baec8db1eef200a12248b0e83a081a270cb47f9 /intern/cycles/blender/blender_mesh.cpp | |
| parent | 3314184f4d77bed0d9b4cdc186154b2289b5ab75 (diff) | |
Fix #29555: cycles crash rendering with no material in material slot.
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 e247b3744fa..4b7651dba4c 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) |