diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-11 12:57:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-11 12:57:54 +0400 |
| commit | 1c84fb234fd2eb62454fc9d261124f3b048d454f (patch) | |
| tree | 7a22d108bab648e48a71d4958e3bc4e40f3da87f /intern | |
| parent | 85908b498b387ace3a0be2dfb321968b7a3a9cd1 (diff) | |
Fix #30896: cycles mask layer not working for objects without material assigned.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index a81253ebb79..7c8d36ab574 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -243,8 +243,12 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool holdout, bool object_updated) find_shader(slot->material(), used_shaders, scene->default_surface); } - if(used_shaders.size() == 0) - used_shaders.push_back(scene->default_surface); + if(used_shaders.size() == 0) { + if(holdout) + used_shaders.push_back(scene->default_holdout); + else + used_shaders.push_back(scene->default_surface); + } /* test if we need to sync */ Mesh *mesh; |