diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 06:16:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 06:16:52 +0400 |
| commit | c0eec8f379bb0c265e7bf2ad74397c22836bae3c (patch) | |
| tree | 6502b4e6eaf44a848bebe6406aacd825738877d9 /intern/cycles/blender/blender_mesh.cpp | |
| parent | 68c4368001db49bd3daab96352ca3b4fb7d04e1c (diff) | |
| parent | 84437bb5e9342e67f448e26adb0c4b0811f3ef5c (diff) | |
svn merge ^/trunk/blender -r43062:43085
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index b3c9cccfb5d..c7844782e78 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -78,8 +78,9 @@ static void create_mesh(Scene *scene, Mesh *mesh, BL::Mesh b_mesh, const vector< for(b_mesh.faces.begin(f); f != b_mesh.faces.end(); ++f) { int4 vi = get_int4(f->vertices_raw()); - int n= (vi[3] == 0)? 3: 4; - int shader = used_shaders[f->material_index()]; + int n = (vi[3] == 0)? 3: 4; + int mi = clamp(f->material_index(), 0, used_shaders.size()-1); + int shader = used_shaders[mi]; bool smooth = f->use_smooth(); mesh->add_triangle(vi[0], vi[1], vi[2], shader, smooth); |